summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-20 15:02:46 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-21 09:35:34 +1000
commitf3d6b742b18589306e0f19cc52e06f108fc1268e (patch)
treef27fc75fb273f477fbda6b8cce6a367283aaf097
parent994abd2dea2164bb005209b77ec2608b4a5fe4e8 (diff)
downloadsamba-f3d6b742b18589306e0f19cc52e06f108fc1268e.tar.gz
samba-f3d6b742b18589306e0f19cc52e06f108fc1268e.tar.bz2
samba-f3d6b742b18589306e0f19cc52e06f108fc1268e.zip
lib/util Make unused d_vfprintf() static
-rw-r--r--lib/util/dprintf.c2
-rw-r--r--lib/util/util.h1
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/lib/dprintf.c2
4 files changed, 2 insertions, 5 deletions
diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c
index e9a15dcbe6..c7c701bcfa 100644
--- 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 e50cc38a2f..f4861a6fcf 100644
--- 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 e6b70c782c..08d5d96ab5 100644
--- 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 ad3c79a8d5..55ea7f9888 100644
--- 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;