From 0cb16fe924fb5c4e58866c28b06ace876e2dcbd3 Mon Sep 17 00:00:00 2001 From: Linquize Date: Wed, 15 May 2013 20:26:55 +0800 Subject: [PATCH] Unify whitespaces to tabs --- include/git2/attr.h | 2 +- include/git2/config.h | 16 ++--- include/git2/inttypes.h | 18 +++--- include/git2/merge.h | 2 +- include/git2/repository.h | 10 +-- include/git2/reset.h | 6 +- include/git2/strarray.h | 4 +- include/git2/sys/refdb_backend.h | 2 +- src/attr.c | 8 +-- src/attr_file.h | 6 +- src/checkout.c | 2 +- src/config.c | 6 +- src/date.c | 6 +- src/diff_output.c | 30 ++++----- src/hash/hash_generic.h | 6 +- src/hash/hash_win32.h | 8 +-- src/merge.h | 28 ++++---- src/notes.c | 38 +++++------ src/refdb_fs.c | 4 +- src/repository.c | 10 +-- src/transports/local.c | 2 +- src/util.h | 8 +-- src/win32/posix_w32.c | 106 +++++++++++++++---------------- 23 files changed, 164 insertions(+), 164 deletions(-) diff --git a/include/git2/attr.h b/include/git2/attr.h index f099245b0..0d8a910f2 100644 --- a/include/git2/attr.h +++ b/include/git2/attr.h @@ -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); diff --git a/include/git2/config.h b/include/git2/config.h index 724788ae0..8d1a1a5a6 100644 --- a/include/git2/config.h +++ b/include/git2/config.h @@ -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 @@ -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 diff --git a/include/git2/inttypes.h b/include/git2/inttypes.h index 716084219..17364c7f8 100644 --- a/include/git2/inttypes.h +++ b/include/git2/inttypes.h @@ -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 diff --git a/include/git2/merge.h b/include/git2/merge.h index 8ca90b95f..738d8e028 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -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. */ diff --git a/include/git2/repository.h b/include/git2/repository.h index e0464c63f..bb2b3db83 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -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. diff --git a/include/git2/reset.h b/include/git2/reset.h index c7c951942..c36781722 100644 --- a/include/git2/reset.h +++ b/include/git2/reset.h @@ -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 diff --git a/include/git2/strarray.h b/include/git2/strarray.h index d338eb7ad..86fa25f3f 100644 --- a/include/git2/strarray.h +++ b/include/git2/strarray.h @@ -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; /** diff --git a/include/git2/sys/refdb_backend.h b/include/git2/sys/refdb_backend.h index 8dbf38ca9..548597fbc 100644 --- a/include/git2/sys/refdb_backend.h +++ b/include/git2/sys/refdb_backend.h @@ -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 diff --git a/src/attr.c b/src/attr.c index 6dd2c7e2f..9fe4471f6 100644 --- a/src/attr.c +++ b/src/attr.c @@ -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) @@ -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; @@ -151,7 +151,7 @@ cleanup: 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), diff --git a/src/attr_file.h b/src/attr_file.h index d8abcda58..15bba1c6a 100644 --- a/src/attr_file.h +++ b/src/attr_file.h @@ -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 { diff --git a/src/checkout.c b/src/checkout.c index 6835db073..68028dfef 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -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; diff --git a/src/config.c b/src/config.c index bd629f7c4..dc8c7024e 100644 --- a/src/config.c +++ b/src/config.c @@ -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; diff --git a/src/date.c b/src/date.c index ce1721a0b..48841e4f9 100644 --- a/src/date.c +++ b/src/date.c @@ -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; @@ -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, ×tamp, &offset)) { - *out = timestamp; + *out = timestamp; return 0; } diff --git a/src/diff_output.c b/src/diff_output.c index 07fcf47a7..be1ff56e7 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -1712,12 +1712,12 @@ notfound: } 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); @@ -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; diff --git a/src/hash/hash_generic.h b/src/hash/hash_generic.h index b731de8b3..6b60c98c4 100644 --- a/src/hash/hash_generic.h +++ b/src/hash/hash_generic.h @@ -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 diff --git a/src/hash/hash_win32.h b/src/hash/hash_win32.h index daa769b59..2eee5ca79 100644 --- a/src/hash/hash_win32.h +++ b/src/hash/hash_win32.h @@ -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, diff --git a/src/merge.h b/src/merge.h index 6307d1569..da1fdf472 100644 --- a/src/merge.h +++ b/src/merge.h @@ -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( diff --git a/src/notes.c b/src/notes.c index 4ca2aaa63..3e3db58db 100644 --- a/src/notes.c +++ b/src/notes.c @@ -579,30 +579,30 @@ cleanup: } 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(¬e_id, &annotated_id, iter))) { - if (note_cb(¬e_id, &annotated_id, payload)) { - error = GIT_EUSER; - break; - } - } + while (!(error = git_note_next(¬e_id, &annotated_id, iter))) { + if (note_cb(¬e_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; } diff --git a/src/refdb_fs.c b/src/refdb_fs.c index c462a4251..b9df83f81 100644 --- a/src/refdb_fs.c +++ b/src/refdb_fs.c @@ -257,8 +257,8 @@ static int packed_load(refdb_fs_backend *backend) if (packed_parse_peel(ref, &buffer_start, buffer_end) < 0) goto parse_failed; } else if (backend->peeling_mode == PEELING_FULL || - (backend->peeling_mode == PEELING_STANDARD && - git__prefixcmp(ref->name, GIT_REFS_TAGS_DIR) == 0)) { + (backend->peeling_mode == PEELING_STANDARD && + git__prefixcmp(ref->name, GIT_REFS_TAGS_DIR) == 0)) { ref->flags |= PACKREF_CANNOT_PEEL; } diff --git a/src/repository.c b/src/repository.c index 4ab3921bb..9957f32b7 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1636,11 +1636,11 @@ int git_repository_message_remove(git_repository *repo) } 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) { int error; git_vector filters = GIT_VECTOR_INIT; diff --git a/src/transports/local.c b/src/transports/local.c index bd3bf93bf..2530a847f 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -495,7 +495,7 @@ static int local_download_pack( /* Tag or some other wanted object. Add it on its own */ error = git_packbuilder_insert(pack, &rhead->oid, rhead->name); } - git_object_free(obj); + git_object_free(obj); } /* Walk the objects, building a packfile */ diff --git a/src/util.h b/src/util.h index 687afe084..6f876d012 100644 --- a/src/util.h +++ b/src/util.h @@ -262,22 +262,22 @@ GIT_INLINE(size_t) git__size_t_powerof2(size_t v) GIT_INLINE(bool) git__isupper(int c) { - return (c >= 'A' && c <= 'Z'); + return (c >= 'A' && c <= 'Z'); } GIT_INLINE(bool) git__isalpha(int c) { - return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); + return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); } GIT_INLINE(bool) git__isdigit(int c) { - return (c >= '0' && c <= '9'); + return (c >= '0' && c <= '9'); } GIT_INLINE(bool) git__isspace(int c) { - return (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' || c == '\v' || c == 0x85 /* Unicode CR+LF */); + return (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' || c == '\v' || c == 0x85 /* Unicode CR+LF */); } GIT_INLINE(bool) git__iswildcard(int c) diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c index 52eb4638a..b9115836e 100644 --- a/src/win32/posix_w32.c +++ b/src/win32/posix_w32.c @@ -479,29 +479,29 @@ int p_send(GIT_SOCKET socket, const void *buffer, size_t length, int flags) * Borrowed from http://old.nabble.com/Porting-localtime_r-and-gmtime_r-td15282276.html * On Win32, `gmtime_r` doesn't exist but `gmtime` is threadsafe, so we can use that */ -struct tm * -p_localtime_r (const time_t *timer, struct tm *result) -{ - struct tm *local_result; - local_result = localtime (timer); +struct tm * +p_localtime_r (const time_t *timer, struct tm *result) +{ + struct tm *local_result; + local_result = localtime (timer); - if (local_result == NULL || result == NULL) - return NULL; + if (local_result == NULL || result == NULL) + return NULL; - memcpy (result, local_result, sizeof (struct tm)); - return result; -} -struct tm * -p_gmtime_r (const time_t *timer, struct tm *result) -{ - struct tm *local_result; - local_result = gmtime (timer); + memcpy (result, local_result, sizeof (struct tm)); + return result; +} +struct tm * +p_gmtime_r (const time_t *timer, struct tm *result) +{ + struct tm *local_result; + local_result = gmtime (timer); - if (local_result == NULL || result == NULL) - return NULL; + if (local_result == NULL || result == NULL) + return NULL; - memcpy (result, local_result, sizeof (struct tm)); - return result; + memcpy (result, local_result, sizeof (struct tm)); + return result; } #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) @@ -514,44 +514,44 @@ p_gmtime_r (const time_t *timer, struct tm *result) #define _TIMEZONE_DEFINED struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ }; #endif - + int p_gettimeofday(struct timeval *tv, struct timezone *tz) { - FILETIME ft; - unsigned __int64 tmpres = 0; - static int tzflag; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - - /*converting file time to unix epoch*/ - tmpres /= 10; /*convert into microseconds*/ - tmpres -= DELTA_EPOCH_IN_MICROSECS; - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; + FILETIME ft; + unsigned __int64 tmpres = 0; + static int tzflag; + + if (NULL != tv) + { + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres /= 10; /*convert into microseconds*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + if (NULL != tz) + { + if (!tzflag) + { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; } int p_inet_pton(int af, const char* src, void* dst)