From 0a6543b7fe8e526ad72928495434938f7c730a89 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 19 Sep 2012 11:47:31 +0200 Subject: [PATCH] Revert "notes.c: mark a private file-scope symbol as static" This reverts commit 96531a5ede7ede4397eb190411bc20256bca3e93. --- notes.c | 14 ++------------ notes.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/notes.c b/notes.c index bc454e1eab..93e9868d5d 100644 --- a/notes.c +++ b/notes.c @@ -1196,18 +1196,8 @@ void free_notes(struct notes_tree *t) memset(t, 0, sizeof(struct notes_tree)); } -/* - * Fill the given strbuf with the notes associated with the given object. - * - * If the given notes_tree structure is not initialized, it will be auto- - * initialized to the default value (see documentation for init_notes() above). - * If the given notes_tree is NULL, the internal/default notes_tree will be - * used instead. - * - * 'flags' is a bitwise combination of the flags for format_display_notes. - */ -static void format_note(struct notes_tree *t, const unsigned char *object_sha1, - struct strbuf *sb, const char *output_encoding, int flags) +void format_note(struct notes_tree *t, const unsigned char *object_sha1, + struct strbuf *sb, const char *output_encoding, int flags) { static const char utf8[] = "utf-8"; const unsigned char *sha1; diff --git a/notes.h b/notes.h index 3592b19d2d..c716694b9e 100644 --- a/notes.h +++ b/notes.h @@ -241,6 +241,20 @@ void free_notes(struct notes_tree *t); #define NOTES_SHOW_HEADER 1 #define NOTES_INDENT 2 +/* + * Fill the given strbuf with the notes associated with the given object. + * + * If the given notes_tree structure is not initialized, it will be auto- + * initialized to the default value (see documentation for init_notes() above). + * If the given notes_tree is NULL, the internal/default notes_tree will be + * used instead. + * + * 'flags' is a bitwise combination of the above formatting flags. + */ +void format_note(struct notes_tree *t, const unsigned char *object_sha1, + struct strbuf *sb, const char *output_encoding, int flags); + + struct string_list; struct display_notes_opt { -- 2.11.4.GIT