Subject: [PATCH 2/2] refs: remove forward declaration for files_log_ref_write()
From: Ramsay Jones <hidden>
Date: 2017-03-19 20:25:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Commit 7d3989dac9 ("files-backend: make files_log_ref_write() static",
18-03-2017) made the files_log_ref_write() function static by adding
an, otherwise useless, forward declaration. This causes sparse to
issue a warning. A much simpler solution is to simply add the static
keyword to the function definition.
Signed-off-by: Ramsay Jones <redacted>
---
Hi Duy,
If you need to re-roll your 'nd/files-backend-git-dir' branch, could you please
squash this into the relevant patch.
Thanks!
ATB,
Ramsay Jones
refs/files-backend.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0f423be18..b4cae64ab 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c@@ -165,10 +165,6 @@ static struct ref_entry *create_dir_entry(struct files_ref_store *ref_store, const char *dirname, size_t len, int incomplete); static void add_entry_to_dir(struct ref_dir *dir, struct ref_entry *entry); -static int files_log_ref_write(struct files_ref_store *refs, - const char *refname, const unsigned char *old_sha1, - const unsigned char *new_sha1, const char *msg, - int flags, struct strbuf *err); static struct ref_dir *get_ref_dir(struct ref_entry *entry) {
@@ -2926,10 +2922,10 @@ static int log_ref_write_fd(int fd, const unsigned char *old_sha1, return 0; } -int files_log_ref_write(struct files_ref_store *refs, - const char *refname, const unsigned char *old_sha1, - const unsigned char *new_sha1, const char *msg, - int flags, struct strbuf *err) +static int files_log_ref_write(struct files_ref_store *refs, + const char *refname, const unsigned char *old_sha1, + const unsigned char *new_sha1, const char *msg, + int flags, struct strbuf *err) { int logfd, result;
--
2.12.0