read-cache.c: mark file-local functions static

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 30b9048dfe052f898bf7af91b40a3fd7206c7acb..e7bb6b795e626e9caf30061310ba00eb2deaae28 100644 (file)
--- 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);
 #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);
 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);
 }
 {
        memset(hash, 0, 20);
 }

-extern int is_empty_blob_sha1(const unsigned char *sha1);

 
 #define EMPTY_TREE_SHA1_HEX \
        "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
 
 #define EMPTY_TREE_SHA1_HEX \
        "4b825dc642cb6eb9a060e54bf8d69288fbee4904"

diff --git a/read-cache.c b/read-cache.c
index 9033dd3ab938e2ee7b4248ff97645414ee3688db..9f4f44cb62567375ca1169acbc0542d4463793d4 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -15,6 +15,8 @@
 #include "revision.h"
 #include "blob.h"
 
 #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
 /* 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;
 }
 
        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,
 {
        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;
 }
 
        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);
 }
 {
        return refresh_cache_ent(&the_index, ce, really, NULL);
 }