Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
read-cache.c: mark a private file-scope symbol as static
author
Junio C Hamano
<gitster@pobox.com>
Sun, 16 Sep 2012 05:44:31 +0000
(22:44 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 16 Sep 2012 05:58:21 +0000
(22:58 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h
patch
|
blob
|
history
read-cache.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ea03a8e
)
diff --git
a/cache.h
b/cache.h
index c9739d4d45e89ca69412406d031af93924ceab38..032f6711c17d6ab342df77bde58f53a5bf610e39 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-442,7
+442,6
@@
extern int discard_index(struct index_state *);
extern int unmerged_index(const struct index_state *);
extern int verify_path(const char *path);
extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
extern int unmerged_index(const struct index_state *);
extern int verify_path(const char *path);
extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
-extern int index_name_stage_pos(const struct index_state *, const char *name, int namelen, int stage);
extern int index_name_pos(const struct index_state *, const char *name, int namelen);
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
extern int index_name_pos(const struct index_state *, const char *name, int namelen);
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
diff --git
a/read-cache.c
b/read-cache.c
index 79e3bbe0240e16629e8ba4b755d60f986132802a..fda78bc353afcfd4d01864f2a13158d9c9c55173 100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-424,7
+424,7
@@
int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
}
return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
}
-int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
+
static
int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
{
int first, last;
{
int first, last;