lib/util Make unused d_vfprintf() static

diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c
index e9a15dcbe625c5e41238f208b6b04de10ae00c3f..c7c701bcfadfd1379f953f50b1bd04f0d4d3e8b9 100644 (file)
--- a/lib/util/dprintf.c
+++ b/lib/util/dprintf.c
@@ -45,7 +45,7 @@ void d_set_iconv(smb_iconv_t cd)
        display_cd = cd;
 }
 
-_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) 
+static int d_vfprintf(FILE *f, const char *format, va_list ap) 
 {
        char *p, *p2;
        int ret, clen;

diff --git a/lib/util/util.h b/lib/util/util.h
index e50cc38a2f66cc56d3b37cdd41ff9b2f835f54e6..f4861a6fcfbaa70be42a8c9f36c2372f42b1e812 100644 (file)
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -214,7 +214,6 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx, size_t len,
 #if _SAMBA_BUILD_ == 4
 
 _PUBLIC_ void d_set_iconv(smb_iconv_t);
-_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
 _PUBLIC_ int d_fprintf(FILE *f, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
 _PUBLIC_ int d_printf(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
 _PUBLIC_ void display_set_stderr(void);

diff --git a/source3/include/includes.h b/source3/include/includes.h
index e6b70c782cf913318aecf76ac5b13c8c1bb1ba1f..08d5d96ab5581eced36a043d43f59e9df5b28b1e 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -608,8 +608,6 @@ void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,
 /* PRINTFLIKE2 */
 int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 
-int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
-
 int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
 
 int asprintf_strupper_m(char **strp, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index ad3c79a8d521bee6a0425ab78288c4ba335ceb52..55ea7f98886b646db0ffdb9b5c8b967ec80780f8 100644 (file)
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -31,7 +31,7 @@
 #include "includes.h"
 #include "intl/lang_tdb.h"
 
- int d_vfprintf(FILE *f, const char *format, va_list ap)
+static int d_vfprintf(FILE *f, const char *format, va_list ap)
 {
        char *p = NULL, *p2 = NULL;
        int ret, maxlen, clen;