diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:37:25 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:37:25 -0800 |
commit | 56eb8b43ebdb38683ff5ce395d7b5e080d402b5b (patch) | |
tree | 759ed075b90f29999e504654e3d92a470e9ab3c0 /read-cache.c | |
parent | c216830f3828ae54c956a06fa6e4fdf212eecec1 (diff) | |
parent | 23418ea95f83177df19bfe18af33650b87ec2a8a (diff) | |
download | git-56eb8b43ebdb38683ff5ce395d7b5e080d402b5b.tar.gz git-56eb8b43ebdb38683ff5ce395d7b5e080d402b5b.tar.xz |
Merge branch 'jc/symbol-static'
* jc/symbol-static:
date.c: mark file-local function static
Replace parse_blob() with an explanatory comment
symlinks.c: remove unused functions
object.c: remove unused functions
strbuf.c: remove unused function
sha1_file.c: remove unused function
mailmap.c: remove unused function
utf8.c: mark file-local function static
submodule.c: mark file-local function static
quote.c: mark file-local function static
remote-curl.c: mark file-local function static
read-cache.c: mark file-local functions static
parse-options.c: mark file-local function static
entry.c: mark file-local function static
http.c: mark file-local functions static
pretty.c: mark file-local function static
builtin-rev-list.c: mark file-local function static
bisect.c: mark file-local function static
Diffstat (limited to 'read-cache.c')
-rw-r--r-- | read-cache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/read-cache.c b/read-cache.c index d214abab1..f4512967b 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, @@ -1152,7 +1154,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); } |