From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 08/18] read-cache.c: mark file-local functions static
Date: Mon, 11 Jan 2010 23:52:51 -0800 [thread overview]
Message-ID: <1263282781-25596-9-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1263282781-25596-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* has conflicts when applied to 'pu' but nothing "am -3" cannot fix.
* remove_index_entry_at() is left exported even though it can become
static in 'master'; it is used in 'pu'.
cache.h | 2 --
read-cache.c | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cache.h b/cache.h
index 30b9048..e7bb6b7 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 9033dd3..9f4f44c 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);
}
--
1.6.6.280.ge295b7.dirty
next prev parent reply other threads:[~2010-01-12 7:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-12 7:52 [PATCH 00/18] mark file-local symbols static Junio C Hamano
2010-01-12 7:52 ` [PATCH 01/18] bisect.c: mark file-local function static Junio C Hamano
2010-01-12 7:52 ` [PATCH 02/18] builtin-rev-list.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 03/18] pretty.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 04/18] date.c: " Junio C Hamano
2010-01-12 8:37 ` Johannes Sixt
2010-01-12 9:05 ` Junio C Hamano
2010-01-12 9:43 ` Johannes Sixt
2010-01-12 7:52 ` [PATCH 05/18] http.c: mark file-local functions static Junio C Hamano
2010-01-12 7:52 ` [PATCH 06/18] entry.c: mark file-local function static Junio C Hamano
2010-01-12 7:52 ` [PATCH 07/18] parse-options.c: " Junio C Hamano
2010-01-12 7:52 ` Junio C Hamano [this message]
2010-01-12 7:52 ` [PATCH 09/18] remote-curl.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 10/18] quote.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 11/18] submodule.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 12/18] utf8.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 13/18] mailmap.c: remove unused function Junio C Hamano
2010-01-12 7:52 ` [PATCH 14/18] sha1_file.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 15/18] strbuf.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 16/18] blob.c: " Junio C Hamano
2010-01-12 17:37 ` Daniel Barkalow
2010-01-13 6:56 ` Junio C Hamano
2010-01-12 7:53 ` [PATCH 17/18] object.c: remove unused functions Junio C Hamano
2010-01-12 7:53 ` [PATCH 18/18] symlinks.c: " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263282781-25596-9-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).