diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/commit.c | 4 | ||||
| -rw-r--r-- | src/commit.h | 1 | ||||
| -rw-r--r-- | src/config_file.c | 2 | ||||
| -rw-r--r-- | src/mwindow.c | 2 | ||||
| -rw-r--r-- | src/odb_loose.c | 22 | ||||
| -rw-r--r-- | src/odb_pack.c | 8 | ||||
| -rw-r--r-- | src/refs.c | 2 | ||||
| -rw-r--r-- | src/remote.c | 5 | ||||
| -rw-r--r-- | src/revwalk.c | 6 | ||||
| -rw-r--r-- | src/signature.c | 6 | ||||
| -rw-r--r-- | src/tree.c | 4 | ||||
| -rw-r--r-- | tests/t04-commit.c | 9 | ||||
| -rw-r--r-- | tests/t07-hashtable.c | 4 | ||||
| -rw-r--r-- | tests/t12-repo.c | 4 | ||||
| -rwxr-xr-x | tests/test_lib.h | 1 |
16 files changed, 38 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0ac57ac1..b4a9dba4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ IF (MSVC) SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd") SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") ELSE () - SET(CMAKE_C_FLAGS "-O2 -g -Wall -Wextra -Wstrict-aliasing=2 -Wstrict-prototypes") + SET(CMAKE_C_FLAGS "-O2 -g -Wall -Wextra -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes") IF (NOT MINGW) # MinGW always does PIC and complains if we tell it to SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ENDIF () diff --git a/src/commit.c b/src/commit.c index dc9e5362a..d9cc11078 100644 --- a/src/commit.c +++ b/src/commit.c @@ -187,7 +187,7 @@ cleanup: return error; } -int commit_parse_buffer(git_commit *commit, const void *data, size_t len) +int git_commit__parse_buffer(git_commit *commit, const void *data, size_t len) { const char *buffer = data; const char *buffer_end = (const char *)data + len; @@ -254,7 +254,7 @@ int commit_parse_buffer(git_commit *commit, const void *data, size_t len) int git_commit__parse(git_commit *commit, git_odb_object *obj) { assert(commit); - return commit_parse_buffer(commit, obj->raw.data, obj->raw.len); + return git_commit__parse_buffer(commit, obj->raw.data, obj->raw.len); } #define GIT_COMMIT_GETTER(_rvalue, _name, _return) \ diff --git a/src/commit.h b/src/commit.h index ff2f28248..6d1caeeeb 100644 --- a/src/commit.h +++ b/src/commit.h @@ -24,4 +24,5 @@ struct git_commit { void git_commit__free(git_commit *c); int git_commit__parse(git_commit *commit, git_odb_object *obj); +int git_commit__parse_buffer(git_commit *commit, const void *data, size_t len); #endif diff --git a/src/config_file.c b/src/config_file.c index 520a806b5..fc41590f6 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -572,7 +572,7 @@ static char *cfg_readline(diskfile_backend *cfg) /* * Consume a line, without storing it anywhere */ -void cfg_consume_line(diskfile_backend *cfg) +static void cfg_consume_line(diskfile_backend *cfg) { char *line_start, *line_end; diff --git a/src/mwindow.c b/src/mwindow.c index 585d75c12..cf2427349 100644 --- a/src/mwindow.c +++ b/src/mwindow.c @@ -131,7 +131,7 @@ void git_mwindow_scan_lru( * Close the least recently used window. You should check to see if * the file descriptors need closing from time to time. */ -int git_mwindow_close_lru(git_mwindow_file *mwf) +static int git_mwindow_close_lru(git_mwindow_file *mwf) { unsigned int i; git_mwindow *lru_w = NULL, *lru_l = NULL; diff --git a/src/odb_loose.c b/src/odb_loose.c index a3a4e5b56..f78750899 100644 --- a/src/odb_loose.c +++ b/src/odb_loose.c @@ -481,7 +481,7 @@ static int locate_object(char *object_location, loose_backend *backend, const gi } /* Explore an entry of a directory and see if it matches a short oid */ -int fn_locate_object_short_oid(void *state, char *pathbuf) { +static int fn_locate_object_short_oid(void *state, char *pathbuf) { loose_locate_object_state *sstate = (loose_locate_object_state *)state; size_t pathbuf_len = strlen(pathbuf); @@ -577,7 +577,7 @@ static int locate_object_short_oid(char *object_location, git_oid *res_oid, loos * ***********************************************************/ -int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) +static int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) { char object_path[GIT_PATH_MAX]; git_rawobj raw; @@ -599,7 +599,7 @@ int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend return GIT_SUCCESS; } -int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) +static int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) { char object_path[GIT_PATH_MAX]; git_rawobj raw; @@ -620,7 +620,7 @@ int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_o return GIT_SUCCESS; } -int loose_backend__read_prefix( +static int loose_backend__read_prefix( git_oid *out_oid, void **buffer_p, size_t *len_p, @@ -661,7 +661,7 @@ int loose_backend__read_prefix( return GIT_SUCCESS; } -int loose_backend__exists(git_odb_backend *backend, const git_oid *oid) +static int loose_backend__exists(git_odb_backend *backend, const git_oid *oid) { char object_path[GIT_PATH_MAX]; @@ -670,7 +670,7 @@ int loose_backend__exists(git_odb_backend *backend, const git_oid *oid) return locate_object(object_path, (loose_backend *)backend, oid) == GIT_SUCCESS; } -int loose_backend__stream_fwrite(git_oid *oid, git_odb_stream *_stream) +static int loose_backend__stream_fwrite(git_oid *oid, git_odb_stream *_stream) { loose_writestream *stream = (loose_writestream *)_stream; loose_backend *backend = (loose_backend *)_stream->backend; @@ -691,13 +691,13 @@ int loose_backend__stream_fwrite(git_oid *oid, git_odb_stream *_stream) return git_filebuf_commit_at(&stream->fbuf, final_path); } -int loose_backend__stream_write(git_odb_stream *_stream, const char *data, size_t len) +static int loose_backend__stream_write(git_odb_stream *_stream, const char *data, size_t len) { loose_writestream *stream = (loose_writestream *)_stream; return git_filebuf_write(&stream->fbuf, data, len); } -void loose_backend__stream_free(git_odb_stream *_stream) +static void loose_backend__stream_free(git_odb_stream *_stream) { loose_writestream *stream = (loose_writestream *)_stream; @@ -720,7 +720,7 @@ static int format_object_header(char *hdr, size_t n, size_t obj_len, git_otype o return len+1; } -int loose_backend__stream(git_odb_stream **stream_out, git_odb_backend *_backend, size_t length, git_otype type) +static int loose_backend__stream(git_odb_stream **stream_out, git_odb_backend *_backend, size_t length, git_otype type) { loose_backend *backend; loose_writestream *stream; @@ -772,7 +772,7 @@ int loose_backend__stream(git_odb_stream **stream_out, git_odb_backend *_backend return GIT_SUCCESS; } -int loose_backend__write(git_oid *oid, git_odb_backend *_backend, const void *data, size_t len, git_otype type) +static int loose_backend__write(git_oid *oid, git_odb_backend *_backend, const void *data, size_t len, git_otype type) { int error, header_len; char final_path[GIT_PATH_MAX], header[64]; @@ -815,7 +815,7 @@ cleanup: return error; } -void loose_backend__free(git_odb_backend *_backend) +static void loose_backend__free(git_odb_backend *_backend) { loose_backend *backend; assert(_backend); diff --git a/src/odb_pack.c b/src/odb_pack.c index 5b2be58e1..b3db27280 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -381,7 +381,7 @@ int pack_backend__read_header(git_rawobj *obj, git_odb_backend *backend, const g } */ -int pack_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) +static int pack_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) { struct git_pack_entry e; git_rawobj raw; @@ -400,7 +400,7 @@ int pack_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_od return GIT_SUCCESS; } -int pack_backend__read_prefix( +static int pack_backend__read_prefix( git_oid *out_oid, void **buffer_p, size_t *len_p, @@ -439,13 +439,13 @@ int pack_backend__read_prefix( return GIT_SUCCESS; } -int pack_backend__exists(git_odb_backend *backend, const git_oid *oid) +static int pack_backend__exists(git_odb_backend *backend, const git_oid *oid) { struct git_pack_entry e; return pack_entry_find(&e, (struct pack_backend *)backend, oid) == GIT_SUCCESS; } -void pack_backend__free(git_odb_backend *_backend) +static void pack_backend__free(git_odb_backend *_backend) { struct pack_backend *backend; size_t i; diff --git a/src/refs.c b/src/refs.c index 77521bc63..04347d221 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1566,7 +1566,7 @@ int git_reference_foreach(git_repository *repo, unsigned int list_flags, int (*c return git_futils_direach(refs_path, GIT_PATH_MAX, _dirent_loose_listall, &data); } -int cb__reflist_add(const char *ref, void *data) +static int cb__reflist_add(const char *ref, void *data) { return git_vector_insert((git_vector *)data, git__strdup(ref)); } diff --git a/src/remote.c b/src/remote.c index 297789a69..0cd1d9994 100644 --- a/src/remote.c +++ b/src/remote.c @@ -234,11 +234,6 @@ int git_remote_download(char **filename, git_remote *remote) return git_fetch_download_pack(filename, remote); } -git_headarray *git_remote_tips(git_remote *remote) -{ - return &remote->refs; -} - int git_remote_update_tips(struct git_remote *remote) { int error = GIT_SUCCESS; diff --git a/src/revwalk.c b/src/revwalk.c index 538928cb1..667291899 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -70,7 +70,7 @@ struct git_revwalk { unsigned int sorting; }; -commit_list *commit_list_insert(commit_object *item, commit_list **list_p) +static commit_list *commit_list_insert(commit_object *item, commit_list **list_p) { commit_list *new_list = git__malloc(sizeof(commit_list)); new_list->item = item; @@ -79,7 +79,7 @@ commit_list *commit_list_insert(commit_object *item, commit_list **list_p) return new_list; } -void commit_list_free(commit_list **list_p) +static void commit_list_free(commit_list **list_p) { commit_list *list = *list_p; @@ -92,7 +92,7 @@ void commit_list_free(commit_list **list_p) *list_p = NULL; } -commit_object *commit_list_pop(commit_list **stack) +static commit_object *commit_list_pop(commit_list **stack) { commit_list *top = *stack; commit_object *item = top ? top->item : NULL; diff --git a/src/signature.c b/src/signature.c index 327efe247..1890581fa 100644 --- a/src/signature.c +++ b/src/signature.c @@ -221,7 +221,7 @@ static int parse_timezone_offset(const char *buffer, int *offset_out) return GIT_SUCCESS; } -int process_next_token(const char **buffer_out, char **storage, +static int process_next_token(const char **buffer_out, char **storage, const char *token_end, const char *right_boundary) { int error = process_trimming(*buffer_out, storage, token_end, 0); @@ -236,7 +236,7 @@ int process_next_token(const char **buffer_out, char **storage, return GIT_SUCCESS; } -const char *scan_for_previous_token(const char *buffer, const char *left_boundary) +static const char *scan_for_previous_token(const char *buffer, const char *left_boundary) { const char *start; @@ -252,7 +252,7 @@ const char *scan_for_previous_token(const char *buffer, const char *left_boundar return start; } -int parse_time(git_time_t *time_out, const char *buffer) +static int parse_time(git_time_t *time_out, const char *buffer) { long time; int error; diff --git a/src/tree.c b/src/tree.c index ea2a47b59..e0225f90b 100644 --- a/src/tree.c +++ b/src/tree.c @@ -42,7 +42,7 @@ struct tree_key_search { size_t filename_len; }; -int entry_search_cmp(const void *key, const void *array_member) +static int entry_search_cmp(const void *key, const void *array_member) { const struct tree_key_search *ksearch = key; const git_tree_entry *entry = array_member; @@ -55,7 +55,7 @@ int entry_search_cmp(const void *key, const void *array_member) return result ? result : ((int)ksearch->filename_len - (int)entry->filename_len); } -int entry_sort_cmp(const void *a, const void *b) +static int entry_sort_cmp(const void *a, const void *b) { const git_tree_entry *entry_a = (const git_tree_entry *)(a); const git_tree_entry *entry_b = (const git_tree_entry *)(b); diff --git a/tests/t04-commit.c b/tests/t04-commit.c index a8617ed6a..88c7efd81 100644 --- a/tests/t04-commit.c +++ b/tests/t04-commit.c @@ -498,9 +498,6 @@ BEGIN_TEST(signature4, "creating a zero character signature") END_TEST -/* External declaration for testing the buffer parsing method */ -int commit_parse_buffer(git_commit *commit, void *data, size_t len); - BEGIN_TEST(parse2, "parse a whole commit buffer") const int broken_commit_count = sizeof(test_commits_broken) / sizeof(*test_commits_broken); const int working_commit_count = sizeof(test_commits_working) / sizeof(*test_commits_working); @@ -516,7 +513,7 @@ BEGIN_TEST(parse2, "parse a whole commit buffer") memset(commit, 0x0, sizeof(git_commit)); commit->object.repo = repo; - must_fail(commit_parse_buffer( + must_fail(git_commit__parse_buffer( commit, test_commits_broken[i], strlen(test_commits_broken[i])) @@ -532,7 +529,7 @@ BEGIN_TEST(parse2, "parse a whole commit buffer") memset(commit, 0x0, sizeof(git_commit)); commit->object.repo = repo; - must_pass(commit_parse_buffer( + must_pass(git_commit__parse_buffer( commit, test_commits_working[i], strlen(test_commits_working[i])) @@ -544,7 +541,7 @@ BEGIN_TEST(parse2, "parse a whole commit buffer") memset(commit, 0x0, sizeof(git_commit)); commit->object.repo = repo; - must_pass(commit_parse_buffer( + must_pass(git_commit__parse_buffer( commit, test_commits_working[i], strlen(test_commits_working[i])) diff --git a/tests/t07-hashtable.c b/tests/t07-hashtable.c index 7313f2cc9..c0e852259 100644 --- a/tests/t07-hashtable.c +++ b/tests/t07-hashtable.c @@ -34,7 +34,7 @@ typedef struct _aux_object { int visited; } table_item; -uint32_t hash_func(const void *key, int hash_id) +static uint32_t hash_func(const void *key, int hash_id) { uint32_t r; const git_oid *id = key; @@ -43,7 +43,7 @@ uint32_t hash_func(const void *key, int hash_id) return r; } -int hash_cmpkey(const void *a, const void *b) +static int hash_cmpkey(const void *a, const void *b) { return git_oid_cmp(a, b); } diff --git a/tests/t12-repo.c b/tests/t12-repo.c index cc8942f40..61e96d685 100644 --- a/tests/t12-repo.c +++ b/tests/t12-repo.c @@ -34,7 +34,7 @@ typedef struct { int position; } fake_backend; -git_odb_backend *new_backend(int position) +static git_odb_backend *new_backend(int position) { fake_backend *b; @@ -47,7 +47,7 @@ git_odb_backend *new_backend(int position) return (git_odb_backend *)b; } -int test_backend_sorting(git_odb *odb) +static int test_backend_sorting(git_odb *odb) { unsigned int i; diff --git a/tests/test_lib.h b/tests/test_lib.h index fc75ed771..9d90e4847 100755 --- a/tests/test_lib.h +++ b/tests/test_lib.h @@ -13,6 +13,7 @@ #define SUITE_NAME(SNAME) libgit2_suite_##SNAME #define BEGIN_SUITE(SNAME) \ + git_testsuite *libgit2_suite_##SNAME(void);\ git_testsuite *libgit2_suite_##SNAME(void) {\ git_testsuite *_gitsuite = git_testsuite_new(#SNAME); |