From ebdc302e3e930ec7f3f6e818ecc815a7a5f01781 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:20:55 -0800 Subject: [PATCH 01/18] bisect.c: mark file-local function static Signed-off-by: Junio C Hamano --- bisect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bisect.c b/bisect.c index f1a1f84aa0..5c03398841 100644 --- a/bisect.c +++ b/bisect.c @@ -593,7 +593,7 @@ struct commit_list *filter_skipped(struct commit_list *list, * is increased by one between each call, but that should not matter * for this application. */ -int get_prn(int count) { +static int get_prn(int count) { count = count * 1103515245 + 12345; return ((unsigned)(count/65536) % PRN_MODULO); } From f1c92c6369511396ab3a409b5c9957066b72f6a3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:21:18 -0800 Subject: [PATCH 02/18] builtin-rev-list.c: mark file-local function static Signed-off-by: Junio C Hamano --- bisect.h | 2 -- builtin-rev-list.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bisect.h b/bisect.h index 82f8fc1910..0862ce56d7 100644 --- a/bisect.h +++ b/bisect.h @@ -27,8 +27,6 @@ struct rev_list_info { const char *header_prefix; }; -extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all); - extern int bisect_next_all(const char *prefix); extern int estimate_bisect_steps(int all); diff --git a/builtin-rev-list.c b/builtin-rev-list.c index cd97ded4d2..c924b3a2c7 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -253,7 +253,7 @@ static void print_var_int(const char *var, int val) printf("%s=%d\n", var, val); } -int show_bisect_vars(struct rev_list_info *info, int reaches, int all) +static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) { int cnt, flags = info->bisect_show_flags; char hex[41] = ""; From cc5711424b7ae36276a40c06ede5d95f87ca20f0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:23:35 -0800 Subject: [PATCH 03/18] pretty.c: mark file-local function static Signed-off-by: Junio C Hamano --- commit.h | 1 - pretty.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/commit.h b/commit.h index e5332efcfc..24128d7a2a 100644 --- a/commit.h +++ b/commit.h @@ -73,7 +73,6 @@ struct pretty_print_context struct reflog_walk_info *reflog_info; }; -extern int non_ascii(int); extern int has_non_ascii(const char *text); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ extern char *reencode_commit_message(const struct commit *commit, diff --git a/pretty.c b/pretty.c index 8f5bd1ab7f..9001379a9d 100644 --- a/pretty.c +++ b/pretty.c @@ -83,7 +83,7 @@ static int get_one_line(const char *msg) } /* High bit set, or ISO-2022-INT */ -int non_ascii(int ch) +static int non_ascii(int ch) { return !isascii(ch) || ch == '\033'; } From 83e41e2e61f535d5b432437d4e8ac89c710fc482 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:26:08 -0800 Subject: [PATCH 04/18] http.c: mark file-local functions static Signed-off-by: Junio C Hamano --- http.c | 10 ++++++++-- http.h | 9 --------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/http.c b/http.c index 5c3efb96d9..deab59551d 100644 --- a/http.c +++ b/http.c @@ -651,7 +651,7 @@ static void closedown_active_slot(struct active_request_slot *slot) slot->in_use = 0; } -void release_active_slot(struct active_request_slot *slot) +static void release_active_slot(struct active_request_slot *slot) { closedown_active_slot(slot); if (slot->curl && curl_session_count > min_curl_sessions) { @@ -834,7 +834,13 @@ int http_get_strbuf(const char *url, struct strbuf *result, int options) return http_request(url, result, HTTP_REQUEST_STRBUF, options); } -int http_get_file(const char *url, const char *filename, int options) +/* + * Downloads an url and stores the result in the given file. + * + * If a previous interrupted download is detected (i.e. a previous temporary + * file is still around) the download is resumed. + */ +static int http_get_file(const char *url, const char *filename, int options) { int ret; struct strbuf tmpfile = STRBUF_INIT; diff --git a/http.h b/http.h index f828e1d806..5c9441c10c 100644 --- a/http.h +++ b/http.h @@ -81,7 +81,6 @@ extern int start_active_slot(struct active_request_slot *slot); extern void run_active_slot(struct active_request_slot *slot); extern void finish_active_slot(struct active_request_slot *slot); extern void finish_all_active_slots(void); -extern void release_active_slot(struct active_request_slot *slot); #ifdef USE_CURL_MULTI extern void fill_active_slots(void); @@ -135,14 +134,6 @@ extern char *get_remote_object_url(const char *url, const char *hex, */ int http_get_strbuf(const char *url, struct strbuf *result, int options); -/* - * Downloads an url and stores the result in the given file. - * - * If a previous interrupted download is detected (i.e. a previous temporary - * file is still around) the download is resumed. - */ -int http_get_file(const char *url, const char *filename, int options); - /* * Prints an error message using error() containing url and curl_errorstr, * and returns ret. From 61b97df7d9da21acbd8179e6700f35c8366df9ff Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:27:31 -0800 Subject: [PATCH 05/18] entry.c: mark file-local function static Signed-off-by: Junio C Hamano --- cache.h | 3 --- entry.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cache.h b/cache.h index 3f9ee86147..30b9048dfe 100644 --- a/cache.h +++ b/cache.h @@ -473,9 +473,6 @@ extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_obje extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); -/* "careful lstat()" */ -extern int check_path(const char *path, int len, struct stat *st, int skiplen); - #define REFRESH_REALLY 0x0001 /* ignore_valid */ #define REFRESH_UNMERGED 0x0002 /* allow unmerged */ #define REFRESH_QUIET 0x0004 /* be quiet about it */ diff --git a/entry.c b/entry.c index 06d24f14c6..55b988e22b 100644 --- a/entry.c +++ b/entry.c @@ -179,7 +179,7 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout * This is like 'lstat()', except it refuses to follow symlinks * in the path, after skipping "skiplen". */ -int check_path(const char *path, int len, struct stat *st, int skiplen) +static int check_path(const char *path, int len, struct stat *st, int skiplen) { const char *slash = path + len; From 41064ebc4920fadb6afafe5f09865d2558921c00 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:28:45 -0800 Subject: [PATCH 06/18] parse-options.c: mark file-local function static Signed-off-by: Junio C Hamano --- parse-options.c | 7 +++++-- parse-options.h | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parse-options.c b/parse-options.c index f5594114ed..7bbed5f3e2 100644 --- a/parse-options.c +++ b/parse-options.c @@ -3,6 +3,9 @@ #include "cache.h" #include "commit.h" +static int parse_options_usage(const char * const *usagestr, + const struct option *opts); + #define OPT_SHORT 1 #define OPT_UNSET 2 @@ -560,8 +563,8 @@ void usage_msg_opt(const char *msg, usage_with_options(usagestr, options); } -int parse_options_usage(const char * const *usagestr, - const struct option *opts) +static int parse_options_usage(const char * const *usagestr, + const struct option *opts) { return usage_with_options_internal(usagestr, opts, 0); } diff --git a/parse-options.h b/parse-options.h index f295a2cf85..72fa36011b 100644 --- a/parse-options.h +++ b/parse-options.h @@ -171,9 +171,6 @@ struct parse_opt_ctx_t { const char *prefix; }; -extern int parse_options_usage(const char * const *usagestr, - const struct option *opts); - extern void parse_options_start(struct parse_opt_ctx_t *ctx, int argc, const char **argv, const char *prefix, int flags); From 87b29e5a5ab02f10505fca567d027b57d2a9314e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:29:35 -0800 Subject: [PATCH 07/18] read-cache.c: mark file-local functions static Signed-off-by: Junio C Hamano --- cache.h | 2 -- read-cache.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cache.h b/cache.h index 30b9048dfe..e7bb6b795e 100644 --- a/cache.h +++ b/cache.h @@ -445,7 +445,6 @@ extern int index_name_pos(const struct index_state *, const char *name, int name #define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */ #define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */ extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option); -extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really); extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name); extern int remove_index_entry_at(struct index_state *, int pos); extern void remove_marked_cache_entries(struct index_state *istate); @@ -615,7 +614,6 @@ static inline void hashclr(unsigned char *hash) { memset(hash, 0, 20); } -extern int is_empty_blob_sha1(const unsigned char *sha1); #define EMPTY_TREE_SHA1_HEX \ "4b825dc642cb6eb9a060e54bf8d69288fbee4904" diff --git a/read-cache.c b/read-cache.c index 9033dd3ab9..9f4f44cb62 100644 --- a/read-cache.c +++ b/read-cache.c @@ -15,6 +15,8 @@ #include "revision.h" #include "blob.h" +static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really); + /* Index extensions. * * The first letter should be 'A'..'Z' for extensions that are not @@ -156,7 +158,7 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st) return 0; } -int is_empty_blob_sha1(const unsigned char *sha1) +static int is_empty_blob_sha1(const unsigned char *sha1) { static const unsigned char empty_blob_sha1[20] = { 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, @@ -1141,7 +1143,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p return has_errors; } -struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really) +static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really) { return refresh_cache_ent(&the_index, ce, really, NULL); } From 5092d3ec21ab335e5908fd8abfe99bbc13812606 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:30:36 -0800 Subject: [PATCH 08/18] remote-curl.c: mark file-local function static Signed-off-by: Junio C Hamano --- remote-curl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote-curl.c b/remote-curl.c index 28b2a316d3..b76dcb2e88 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -317,7 +317,7 @@ static size_t rpc_out(void *ptr, size_t eltsize, } #ifndef NO_CURL_IOCTL -curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp) +static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp) { struct rpc_state *rpc = clientp; From 758e915b8a220ebe967edf745eb699b30d501993 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:31:06 -0800 Subject: [PATCH 09/18] quote.c: mark file-local function static Signed-off-by: Junio C Hamano --- quote.c | 2 +- quote.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/quote.c b/quote.c index 848d174cc5..acb6bf929f 100644 --- a/quote.c +++ b/quote.c @@ -72,7 +72,7 @@ void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen) } } -char *sq_dequote_step(char *arg, char **next) +static char *sq_dequote_step(char *arg, char **next) { char *dst = arg; char *src = arg; diff --git a/quote.h b/quote.h index 66730f2bff..f83eb233c4 100644 --- a/quote.h +++ b/quote.h @@ -45,7 +45,6 @@ extern char *sq_dequote(char *); * next argument that should be passed as first parameter. When there * is no more argument to be dequoted, "next" is updated to point to NULL. */ -extern char *sq_dequote_step(char *arg, char **next); extern int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc); extern int unquote_c_style(struct strbuf *, const char *quoted, const char **endp); From cb58c932a58e704b840ede37c55ce3e59a9e7544 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:31:58 -0800 Subject: [PATCH 10/18] submodule.c: mark file-local function static Signed-off-by: Junio C Hamano --- submodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodule.c b/submodule.c index 86aad653b7..3007f7d5a6 100644 --- a/submodule.c +++ b/submodule.c @@ -5,7 +5,7 @@ #include "commit.h" #include "revision.h" -int add_submodule_odb(const char *path) +static int add_submodule_odb(const char *path) { struct strbuf objects_directory = STRBUF_INIT; struct alternate_object_database *alt_odb; From 5e133b8cf9b9b7f9483c47d19ffb40e10827ae51 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 22:32:29 -0800 Subject: [PATCH 11/18] utf8.c: mark file-local function static Signed-off-by: Junio C Hamano --- utf8.c | 2 +- utf8.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/utf8.c b/utf8.c index 7ddff23fa7..ab326ac83e 100644 --- a/utf8.c +++ b/utf8.c @@ -163,7 +163,7 @@ static int git_wcwidth(ucs_char_t ch) * If the string was not a valid UTF-8, *start pointer is set to NULL * and the return value is undefined. */ -ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p) +static ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p) { unsigned char *s = (unsigned char *)*start; ucs_char_t ch; diff --git a/utf8.h b/utf8.h index ae30ae4c6e..c9738d83d9 100644 --- a/utf8.h +++ b/utf8.h @@ -3,7 +3,6 @@ typedef unsigned int ucs_char_t; /* assuming 32bit int */ -ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p); int utf8_width(const char **start, size_t *remainder_p); int utf8_strwidth(const char *string); int is_utf8(const char *text); From 42b3b0061478f262118036286455a8f09a0d3fff Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:11:22 -0800 Subject: [PATCH 12/18] mailmap.c: remove unused function map_email() is not used anywhere. Signed-off-by: Junio C Hamano --- mailmap.c | 5 ----- mailmap.h | 1 - 2 files changed, 6 deletions(-) diff --git a/mailmap.c b/mailmap.c index f167c005bf..b68c1fec9c 100644 --- a/mailmap.c +++ b/mailmap.c @@ -243,8 +243,3 @@ int map_user(struct string_list *map, debug_mm("map_user: --\n"); return 0; } - -int map_email(struct string_list *map, const char *email, char *name, int maxlen) -{ - return map_user(map, (char *)email, 0, name, maxlen); -} diff --git a/mailmap.h b/mailmap.h index 4b2ca3a7de..d5c3664322 100644 --- a/mailmap.h +++ b/mailmap.h @@ -4,7 +4,6 @@ int read_mailmap(struct string_list *map, char **repo_abbrev); void clear_mailmap(struct string_list *map); -int map_email(struct string_list *mailmap, const char *email, char *name, int maxlen); int map_user(struct string_list *mailmap, char *email, int maxlen_email, char *name, int maxlen_name); From 356521ab22fb76e17aa8dc9993ff81fade49e11c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:17:56 -0800 Subject: [PATCH 13/18] sha1_file.c: remove unused function has_pack_file() is not used anywhere. Signed-off-by: Junio C Hamano --- cache.h | 1 - sha1_file.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/cache.h b/cache.h index e7bb6b795e..90edb5b261 100644 --- a/cache.h +++ b/cache.h @@ -683,7 +683,6 @@ extern int has_sha1_pack(const unsigned char *sha1); extern int has_sha1_file(const unsigned char *sha1); extern int has_loose_object_nonlocal(const unsigned char *sha1); -extern int has_pack_file(const unsigned char *sha1); extern int has_pack_index(const unsigned char *sha1); extern const signed char hexval_table[256]; diff --git a/sha1_file.c b/sha1_file.c index 63981fb3fd..7086760dbe 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2458,14 +2458,6 @@ int has_pack_index(const unsigned char *sha1) return 1; } -int has_pack_file(const unsigned char *sha1) -{ - struct stat st; - if (stat(sha1_pack_name(sha1), &st)) - return 0; - return 1; -} - int has_sha1_pack(const unsigned char *sha1) { struct pack_entry e; From 229d8107470ded5e5e6c43cf5daeabf382cce9d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:16:26 -0800 Subject: [PATCH 14/18] strbuf.c: remove unused function strbuf_tolower() is not used anywhere. Signed-off-by: Junio C Hamano --- strbuf.c | 7 ------- strbuf.h | 1 - 2 files changed, 8 deletions(-) diff --git a/strbuf.c b/strbuf.c index a6153dca27..3fa81b3365 100644 --- a/strbuf.c +++ b/strbuf.c @@ -91,13 +91,6 @@ void strbuf_ltrim(struct strbuf *sb) sb->buf[sb->len] = '\0'; } -void strbuf_tolower(struct strbuf *sb) -{ - int i; - for (i = 0; i < sb->len; i++) - sb->buf[i] = tolower(sb->buf[i]); -} - struct strbuf **strbuf_split(const struct strbuf *sb, int delim) { int alloc = 2, pos = 0; diff --git a/strbuf.h b/strbuf.h index fa07ecf094..b37f06a34b 100644 --- a/strbuf.h +++ b/strbuf.h @@ -81,7 +81,6 @@ extern void strbuf_trim(struct strbuf *); extern void strbuf_rtrim(struct strbuf *); extern void strbuf_ltrim(struct strbuf *); extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); -extern void strbuf_tolower(struct strbuf *); extern struct strbuf **strbuf_split(const struct strbuf *, int delim); extern void strbuf_list_free(struct strbuf **); From c76189875b35ca04d42df915cd902a33fdbcb9b0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:15:12 -0800 Subject: [PATCH 15/18] object.c: remove unused functions object_list_append() and object_list_length}() are not used anywhere. Signed-off-by: Junio C Hamano --- object.c | 21 --------------------- object.h | 5 ----- 2 files changed, 26 deletions(-) diff --git a/object.c b/object.c index fe8eaaf19f..3ca92c4c4d 100644 --- a/object.c +++ b/object.c @@ -217,27 +217,6 @@ struct object_list *object_list_insert(struct object *item, return new_list; } -void object_list_append(struct object *item, - struct object_list **list_p) -{ - while (*list_p) { - list_p = &((*list_p)->next); - } - *list_p = xmalloc(sizeof(struct object_list)); - (*list_p)->next = NULL; - (*list_p)->item = item; -} - -unsigned object_list_length(struct object_list *list) -{ - unsigned ret = 0; - while (list) { - list = list->next; - ret++; - } - return ret; -} - int object_list_contains(struct object_list *list, struct object *obj) { while (list) { diff --git a/object.h b/object.h index 89dd0c47a6..82877c831c 100644 --- a/object.h +++ b/object.h @@ -72,11 +72,6 @@ struct object *lookup_unknown_object(const unsigned char *sha1); struct object_list *object_list_insert(struct object *item, struct object_list **list_p); -void object_list_append(struct object *item, - struct object_list **list_p); - -unsigned object_list_length(struct object_list *list); - int object_list_contains(struct object_list *list, struct object *obj); /* Object array handling .. */ From 64161a6b23920c96485131fb51d82d8ca13b4e1d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 21:18:20 -0800 Subject: [PATCH 16/18] symlinks.c: remove unused functions invalidate_lstat_cache() and clear_lstat_cache() are not used anywhere. Signed-off-by: Junio C Hamano --- cache.h | 2 -- symlinks.c | 31 ------------------------------- 2 files changed, 33 deletions(-) diff --git a/cache.h b/cache.h index 90edb5b261..b4b2ba70f6 100644 --- a/cache.h +++ b/cache.h @@ -782,8 +782,6 @@ extern int has_symlink_leading_path(const char *name, int len); extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); extern int has_symlink_or_noent_leading_path(const char *name, int len); extern int has_dirs_only_path(const char *name, int len, int prefix_len); -extern void invalidate_lstat_cache(const char *name, int len); -extern void clear_lstat_cache(void); extern void schedule_dir_for_removal(const char *name, int len); extern void remove_scheduled_dirs(void); diff --git a/symlinks.c b/symlinks.c index 7b0a86d357..8860120011 100644 --- a/symlinks.c +++ b/symlinks.c @@ -179,37 +179,6 @@ static int lstat_cache(struct cache_def *cache, const char *name, int len, return ret_flags; } -/* - * Invalidate the given 'name' from the cache, if 'name' matches - * completely with the cache. - */ -void invalidate_lstat_cache(const char *name, int len) -{ - int match_len, previous_slash; - struct cache_def *cache = &default_cache; /* FIXME */ - - match_len = longest_path_match(name, len, cache->path, cache->len, - &previous_slash); - if (len == match_len) { - if ((cache->track_flags & FL_DIR) && previous_slash > 0) { - cache->path[previous_slash] = '\0'; - cache->len = previous_slash; - cache->flags = FL_DIR; - } else { - reset_lstat_cache(cache); - } - } -} - -/* - * Completely clear the contents of the cache - */ -void clear_lstat_cache(void) -{ - struct cache_def *cache = &default_cache; /* FIXME */ - reset_lstat_cache(cache); -} - #define USE_ONLY_LSTAT 0 /* From 837d395a5c0b98ab938d71db8e2b6b9f69ddcc4d Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Mon, 18 Jan 2010 13:06:28 -0500 Subject: [PATCH 17/18] Replace parse_blob() with an explanatory comment parse_blob() has never actually been used; it has served simply to avoid having a confusing gap in the API. Instead of leaving it, put in a comment that explains what "parsing a blob" entails (making sure the object is actually readable), and why code might care whether a blob has been parsed or not. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- blob.c | 21 --------------------- blob.h | 9 ++++++++- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/blob.c b/blob.c index bd7d078e1a..ae320bd8fa 100644 --- a/blob.c +++ b/blob.c @@ -23,24 +23,3 @@ int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size) item->object.parsed = 1; return 0; } - -int parse_blob(struct blob *item) -{ - enum object_type type; - void *buffer; - unsigned long size; - int ret; - - if (item->object.parsed) - return 0; - buffer = read_sha1_file(item->object.sha1, &type, &size); - if (!buffer) - return error("Could not read %s", - sha1_to_hex(item->object.sha1)); - if (type != OBJ_BLOB) - return error("Object %s not a blob", - sha1_to_hex(item->object.sha1)); - ret = parse_blob_buffer(item, buffer, size); - free(buffer); - return ret; -} diff --git a/blob.h b/blob.h index ea5d9e9f8b..59b394eea3 100644 --- a/blob.h +++ b/blob.h @@ -13,6 +13,13 @@ struct blob *lookup_blob(const unsigned char *sha1); int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size); -int parse_blob(struct blob *item); +/** + * Blobs do not contain references to other objects and do not have + * structured data that needs parsing. However, code may use the + * "parsed" bit in the struct object for a blob to determine whether + * its content has been found to actually be available, so + * parse_blob_buffer() is used (by object.c) to flag that the object + * has been read successfully from the database. + **/ #endif /* BLOB_H */ From 23418ea95f83177df19bfe18af33650b87ec2a8a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jan 2010 23:52:47 -0800 Subject: [PATCH 18/18] date.c: mark file-local function static Signed-off-by: Junio C Hamano --- date.c | 2 +- git-compat-util.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/date.c b/date.c index 5d05ef61cf..45f3684cee 100644 --- a/date.c +++ b/date.c @@ -9,7 +9,7 @@ /* * This is like mktime, but without normalization of tm_wday and tm_yday. */ -time_t tm_to_time_t(const struct tm *tm) +static time_t tm_to_time_t(const struct tm *tm) { static const int mdays[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 diff --git a/git-compat-util.h b/git-compat-util.h index 5c596875c2..85dea123a4 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -198,7 +198,6 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)); extern int prefixcmp(const char *str, const char *prefix); -extern time_t tm_to_time_t(const struct tm *tm); static inline const char *skip_prefix(const char *str, const char *prefix) {