strbuf.c: mark a private file-scope symbol as static

Also remove an unused function.

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

diff --git a/strbuf.c b/strbuf.c
index ec88266718879ebcf89ab95b4c89f83004467869..0510f76c24b3b3ce66baa0f05054d3f01b960b6e 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -445,8 +445,8 @@ static int is_rfc3986_unreserved(char ch)
                ch == '-' || ch == '_' || ch == '.' || ch == '~';
 }
 
                ch == '-' || ch == '_' || ch == '.' || ch == '~';
 }
 

-void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
-                         int reserved)
+static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
+                                int reserved)

 {
        strbuf_grow(sb, len);
        while (len--) {
 {
        strbuf_grow(sb, len);
        while (len--) {


@@ -465,15 +465,6 @@ void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
        strbuf_add_urlencode(sb, s, strlen(s), reserved);
 }
 
        strbuf_add_urlencode(sb, s, strlen(s), reserved);
 }
 

-void strbuf_addf_ln(struct strbuf *sb, const char *fmt, ...)
-{
-       va_list ap;
-       va_start(ap, fmt);
-       strbuf_vaddf(sb, fmt, ap);
-       va_end(ap);
-       strbuf_addch(sb, '\n');
-}
-

 int printf_ln(const char *fmt, ...)
 {
        int ret;
 int printf_ln(const char *fmt, ...)
 {
        int ret;

diff --git a/strbuf.h b/strbuf.h
index b888d405db492c9851696cf6efe66e33d5e1dca8..be941ee481a735dcc73e3821c93e8ee682478d18 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -99,8 +99,6 @@ __attribute__((format (printf,2,3)))
 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 __attribute__((format (printf,2,0)))
 extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 __attribute__((format (printf,2,0)))
 extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);

-__attribute__((format (printf,2,3)))
-extern void strbuf_addf_ln(struct strbuf *sb, const char *fmt, ...);

 
 extern void strbuf_add_lines(struct strbuf *sb, const char *prefix, const char *buf, size_t size);
 
 
 extern void strbuf_add_lines(struct strbuf *sb, const char *prefix, const char *buf, size_t size);
 


@@ -126,8 +124,6 @@ extern int launch_editor(const char *path, struct strbuf *buffer, const char *co
 extern int strbuf_branchname(struct strbuf *sb, const char *name);
 extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
 
 extern int strbuf_branchname(struct strbuf *sb, const char *name);
 extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
 

-extern void strbuf_add_urlencode(struct strbuf *, const char *, size_t,
-                                int reserved);

 extern void strbuf_addstr_urlencode(struct strbuf *, const char *,
                                    int reserved);
 
 extern void strbuf_addstr_urlencode(struct strbuf *, const char *,
                                    int reserved);