Skip to content

Commit

Permalink
Unify whitespaces to tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
linquize committed May 15, 2013
1 parent bc2020d commit 0cb16fe
Show file tree
Hide file tree
Showing 23 changed files with 168 additions and 168 deletions.
2 changes: 1 addition & 1 deletion include/git2/attr.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
*/
GIT_EXTERN(int) git_attr_get(
const char **value_out,
git_repository *repo,
git_repository *repo,
uint32_t flags,
const char *path,
const char *name);
Expand Down
16 changes: 8 additions & 8 deletions include/git2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ GIT_EXTERN(int) git_config_open_ondisk(git_config **out, const char *path);
* multi-level parent config, or an error code
*/
GIT_EXTERN(int) git_config_open_level(
git_config **out,
const git_config *parent,
unsigned int level);
git_config **out,
const git_config *parent,
unsigned int level);

/**
* Open the global/XDG configuration file according to git's rules
Expand Down Expand Up @@ -459,11 +459,11 @@ GIT_EXTERN(int) git_config_foreach_match(
* @return 0 on success, error code otherwise
*/
GIT_EXTERN(int) git_config_get_mapped(
int *out,
const git_config *cfg,
const char *name,
const git_cvar_map *maps,
size_t map_n);
int *out,
const git_config *cfg,
const char *name,
const git_cvar_map *maps,
size_t map_n);

/**
* Maps a string value to an integer constant
Expand Down
18 changes: 9 additions & 9 deletions include/git2/inttypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,18 +283,18 @@ _inline
#endif // STATIC_IMAXDIV ]
imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
{
imaxdiv_t result;
imaxdiv_t result;

result.quot = numer / denom;
result.rem = numer % denom;
result.quot = numer / denom;
result.rem = numer % denom;

if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}
if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}

return result;
return result;
}

// 7.8.2.3 The strtoimax and strtoumax functions
Expand Down
2 changes: 1 addition & 1 deletion include/git2/merge.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ typedef struct {
*/
unsigned int target_limit;

/** Pluggable similarity metric; pass NULL to use internal metric */
/** Pluggable similarity metric; pass NULL to use internal metric */
git_diff_similarity_metric *metric;

/** Flags for automerging content. */
Expand Down
10 changes: 5 additions & 5 deletions include/git2/repository.h
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,11 @@ GIT_EXTERN(int) git_repository_mergehead_foreach(git_repository *repo,
* applied when calculating the hash.
*/
GIT_EXTERN(int) git_repository_hashfile(
git_oid *out,
git_repository *repo,
const char *path,
git_otype type,
const char *as_path);
git_oid *out,
git_repository *repo,
const char *path,
git_otype type,
const char *as_path);

/**
* Make the repository HEAD point to the specified reference.
Expand Down
6 changes: 3 additions & 3 deletions include/git2/reset.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ GIT_EXTERN(int) git_reset(
* @return 0 on success or an error code < 0
*/
GIT_EXTERN(int) git_reset_default(
git_repository *repo,
git_object *target,
git_strarray* pathspecs);
git_repository *repo,
git_object *target,
git_strarray* pathspecs);

/** @} */
GIT_END_DECL
Expand Down
4 changes: 2 additions & 2 deletions include/git2/strarray.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ GIT_BEGIN_DECL

/** Array of strings */
typedef struct git_strarray {
char **strings;
size_t count;
char **strings;
size_t count;
} git_strarray;

/**
Expand Down
2 changes: 1 addition & 1 deletion include/git2/sys/refdb_backend.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct git_reference_iterator {

/** An instance for a custom backend */
struct git_refdb_backend {
unsigned int version;
unsigned int version;

/**
* Queries the refdb backend to determine if the given ref_name
Expand Down
8 changes: 4 additions & 4 deletions src/attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static int collect_attr_files(

int git_attr_get(
const char **value,
git_repository *repo,
git_repository *repo,
uint32_t flags,
const char *pathname,
const char *name)
Expand Down Expand Up @@ -88,10 +88,10 @@ typedef struct {

int git_attr_get_many(
const char **values,
git_repository *repo,
git_repository *repo,
uint32_t flags,
const char *pathname,
size_t num_attr,
size_t num_attr,
const char **names)
{
int error;
Expand Down Expand Up @@ -151,7 +151,7 @@ int git_attr_get_many(


int git_attr_foreach(
git_repository *repo,
git_repository *repo,
uint32_t flags,
const char *pathname,
int (*callback)(const char *name, const char *value, void *payload),
Expand Down
6 changes: 3 additions & 3 deletions src/attr_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ typedef struct {
typedef struct {
git_refcount unused;
const char *name;
uint32_t name_hash;
uint32_t name_hash;
} git_attr_name;

typedef struct {
git_refcount rc; /* for macros */
char *name;
uint32_t name_hash;
const char *value;
uint32_t name_hash;
const char *value;
} git_attr_assignment;

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion src/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ static int blob_content_to_link(
int error;

if ((error = git_futils_mkpath2file(path, dir_mode)) < 0)
return error;
return error;

if ((error = git_blob__getbuf(&linktarget, blob)) < 0)
return error;
Expand Down
6 changes: 3 additions & 3 deletions src/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ int git_config_open_global(git_config **cfg_out, git_config *cfg)
}

int git_config_open_level(
git_config **cfg_out,
const git_config *cfg_parent,
unsigned int level)
git_config **cfg_out,
const git_config *cfg_parent,
unsigned int level)
{
git_config *cfg;
file_internal *internal;
Expand Down
6 changes: 3 additions & 3 deletions src/date.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,8 @@ static void pending_number(struct tm *tm, int *num)
}

static git_time_t approxidate_str(const char *date,
const struct timeval *tv,
int *error_ret)
const struct timeval *tv,
int *error_ret)
{
int number = 0;
int touched = 0;
Expand Down Expand Up @@ -866,7 +866,7 @@ int git__date_parse(git_time_t *out, const char *date)
int offset, error_ret=0;

if (!parse_date_basic(date, &timestamp, &offset)) {
*out = timestamp;
*out = timestamp;
return 0;
}

Expand Down
30 changes: 15 additions & 15 deletions src/diff_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -1712,12 +1712,12 @@ int git_diff_patch_get_line_in_hunk(
}

static int print_to_buffer_cb(
const git_diff_delta *delta,
const git_diff_range *range,
char line_origin,
const char *content,
size_t content_len,
void *payload)
const git_diff_delta *delta,
const git_diff_range *range,
char line_origin,
const char *content,
size_t content_len,
void *payload)
{
git_buf *output = payload;
GIT_UNUSED(delta); GIT_UNUSED(range); GIT_UNUSED(line_origin);
Expand Down Expand Up @@ -1797,16 +1797,16 @@ int git_diff__paired_foreach(
i_max = idx2head ? idx2head->deltas.length : 0;
j_max = wd2idx ? wd2idx->deltas.length : 0;

/* Get appropriate strcmp function */
strcomp = idx2head ? idx2head->strcomp : wd2idx ? wd2idx->strcomp : NULL;
/* Get appropriate strcmp function */
strcomp = idx2head ? idx2head->strcomp : wd2idx ? wd2idx->strcomp : NULL;

/* Assert both iterators use matching ignore-case. If this function ever
* supports merging diffs that are not sorted by the same function, then
* it will need to spool and sort on one of the results before merging
*/
if (idx2head && wd2idx) {
assert(idx2head->strcomp == wd2idx->strcomp);
}
/* Assert both iterators use matching ignore-case. If this function ever
* supports merging diffs that are not sorted by the same function, then
* it will need to spool and sort on one of the results before merging
*/
if (idx2head && wd2idx) {
assert(idx2head->strcomp == wd2idx->strcomp);
}

for (i = 0, j = 0; i < i_max || j < j_max; ) {
i2h = idx2head ? GIT_VECTOR_GET(&idx2head->deltas,i) : NULL;
Expand Down
6 changes: 3 additions & 3 deletions src/hash/hash_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "hash.h"

struct git_hash_ctx {
unsigned long long size;
unsigned int H[5];
unsigned int W[16];
unsigned long long size;
unsigned int H[5];
unsigned int W[16];
};

#define git_hash_global_init() 0
Expand Down
8 changes: 4 additions & 4 deletions src/hash/hash_win32.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ struct hash_cryptoapi_prov {

/* Function declarations for CNG */
typedef NTSTATUS (WINAPI *hash_win32_cng_open_algorithm_provider_fn)(
HANDLE /* BCRYPT_ALG_HANDLE */ *phAlgorithm,
LPCWSTR pszAlgId,
LPCWSTR pszImplementation,
DWORD dwFlags);
HANDLE /* BCRYPT_ALG_HANDLE */ *phAlgorithm,
LPCWSTR pszAlgId,
LPCWSTR pszImplementation,
DWORD dwFlags);

typedef NTSTATUS (WINAPI *hash_win32_cng_get_property_fn)(
HANDLE /* BCRYPT_HANDLE */ hObject,
Expand Down
28 changes: 14 additions & 14 deletions src/merge.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,41 +70,41 @@ typedef enum {


typedef struct {
git_repository *repo;
git_pool pool;
git_repository *repo;
git_pool pool;

/* Vector of git_index_entry that represent the merged items that
/* Vector of git_index_entry that represent the merged items that
* have been staged, either because only one side changed, or because
* the two changes were non-conflicting and mergeable. These items
* will be written as staged entries in the main index.
*/
git_vector staged;
git_vector staged;

/* Vector of git_merge_diff entries that represent the conflicts that
/* Vector of git_merge_diff entries that represent the conflicts that
* have not been automerged. These items will be written to high-stage
* entries in the main index.
*/
git_vector conflicts;
git_vector conflicts;

/* Vector of git_merge_diff that have been automerged. These items
/* Vector of git_merge_diff that have been automerged. These items
* will be written to the REUC when the index is produced.
*/
git_vector resolved;
git_vector resolved;
} git_merge_diff_list;

/**
* Description of changes to one file across three trees.
*/
typedef struct {
git_merge_diff_type_t type;
git_merge_diff_type_t type;

git_index_entry ancestor_entry;
git_index_entry ancestor_entry;

git_index_entry our_entry;
git_delta_t our_status;
git_index_entry our_entry;
git_delta_t our_status;

git_index_entry their_entry;
git_delta_t their_status;
git_index_entry their_entry;
git_delta_t their_status;
} git_merge_diff;

int git_merge__bases_many(
Expand Down
38 changes: 19 additions & 19 deletions src/notes.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,30 +579,30 @@ static int process_entry_path(
}

int git_note_foreach(
git_repository *repo,
const char *notes_ref,
git_note_foreach_cb note_cb,
void *payload)
git_repository *repo,
const char *notes_ref,
git_note_foreach_cb note_cb,
void *payload)
{
int error;
git_note_iterator *iter = NULL;
git_oid note_id, annotated_id;
int error;
git_note_iterator *iter = NULL;
git_oid note_id, annotated_id;

if ((error = git_note_iterator_new(&iter, repo, notes_ref)) < 0)
return error;
if ((error = git_note_iterator_new(&iter, repo, notes_ref)) < 0)
return error;

while (!(error = git_note_next(&note_id, &annotated_id, iter))) {
if (note_cb(&note_id, &annotated_id, payload)) {
error = GIT_EUSER;
break;
}
}
while (!(error = git_note_next(&note_id, &annotated_id, iter))) {
if (note_cb(&note_id, &annotated_id, payload)) {
error = GIT_EUSER;
break;
}
}

if (error == GIT_ITEROVER)
error = 0;
if (error == GIT_ITEROVER)
error = 0;

git_note_iterator_free(iter);
return error;
git_note_iterator_free(iter);
return error;
}


Expand Down
Loading

0 comments on commit 0cb16fe

Please sign in to comment.