summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-29 12:30:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:14:55 -0500
commitce11194ce0fc668008fab1084990bdcca1c120b4 (patch)
tree79033e75db026877e92f387f86803e0100ddde73 /source3
parent43be47f56bcaa2fd93ede867663cddec04fd8fed (diff)
downloadsamba-ce11194ce0fc668008fab1084990bdcca1c120b4.tar.gz
samba-ce11194ce0fc668008fab1084990bdcca1c120b4.tar.bz2
samba-ce11194ce0fc668008fab1084990bdcca1c120b4.zip
r18998: - make more usage of PRINTF_ATTRIBUTE()
- vsyslog takes a 'const char *format' metze (This used to be commit 8899bc45f908a15fb496f5c0a29692e7494a56cc)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/replace/replace.c2
-rw-r--r--source3/lib/replace/replace.h17
2 files changed, 9 insertions, 10 deletions
diff --git a/source3/lib/replace/replace.c b/source3/lib/replace/replace.c
index aa3e8717c2..e7f47d7d52 100644
--- a/source3/lib/replace/replace.c
+++ b/source3/lib/replace/replace.c
@@ -346,7 +346,7 @@ void rep_setlinebuf(FILE *stream)
#ifndef HAVE_VSYSLOG
#ifdef HAVE_SYSLOG
-void rep_vsyslog (int facility_priority, char *format, va_list arglist)
+void rep_vsyslog (int facility_priority, const char *format, va_list arglist)
{
char *msg = NULL;
vasprintf(&msg, format, arglist);
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 7a4b903351..c2a72751d9 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -151,13 +151,6 @@ int rep_setegid(gid_t);
void rep_setlinebuf(FILE *);
#endif
-#ifndef HAVE_VSYSLOG
-#ifdef HAVE_SYSLOG
-#define vsyslog rep_vsyslog
-void rep_vsyslog (int facility_priority, char *format, va_list arglist);
-#endif
-#endif
-
#ifndef HAVE_STRCASESTR
#define strcasestr rep_strcasestr
char *rep_strcasestr(const char *haystack, const char *needle);
@@ -227,7 +220,7 @@ int rep_dlclose(void *handle);
#ifndef HAVE_VASPRINTF
#define vasprintf rep_vasprintf
-int rep_vasprintf(char **ptr, const char *format, va_list ap);
+int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
#endif
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
@@ -237,7 +230,7 @@ int rep_snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
#define vsnprintf rep_vsnprintf
-int rep_vsnprintf(char *,size_t ,const char *, va_list ap);
+int rep_vsnprintf(char *,size_t ,const char *, va_list ap) PRINTF_ATTRIBUTE(3,0);
#endif
#ifndef HAVE_ASPRINTF
@@ -245,6 +238,12 @@ int rep_vsnprintf(char *,size_t ,const char *, va_list ap);
int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
#endif
+#ifndef HAVE_VSYSLOG
+#ifdef HAVE_SYSLOG
+#define vsyslog rep_vsyslog
+void rep_vsyslog (int facility_priority, const char *format, va_list arglist) PRINTF_ATTRIBUTE(2,0);
+#endif
+#endif
/* we used to use these fns, but now we have good replacements
for snprintf and vsnprintf */