summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-28 12:04:34 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-28 12:04:34 +0000
commit838c5c485ffba94a1c74a4556e3e4a2b16020923 (patch)
treeedbd5f8a0fa8451c9cf3f709f91070c70d3cb173
parentfb15277b5e4064432feb79f37f010c792cee1634 (diff)
downloadsamba-838c5c485ffba94a1c74a4556e3e4a2b16020923.tar.gz
samba-838c5c485ffba94a1c74a4556e3e4a2b16020923.tar.bz2
samba-838c5c485ffba94a1c74a4556e3e4a2b16020923.zip
fixed problem with snprintf.c and mkproto
(This used to be commit 99430ce899c02b95ab3c577afff7f28c6d5c6c45)
-rw-r--r--source3/include/proto.h9
-rw-r--r--source3/lib/snprintf.c8
2 files changed, 13 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1b81bb2038..1af68b86d1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -84,6 +84,12 @@ void force_check_log_size( void );
void dbgflush( void );
BOOL dbghdr( int level, char *file, char *func, int line );
+/*The following definitions come from lib/debugparse.c */
+
+char *dbg_token2string( dbg_Token tok );
+void dbg_test( void );
+int main( void );
+
/*The following definitions come from lib/fault.c */
void fault_setup(void (*fn)(void *));
@@ -162,6 +168,9 @@ int vslprintf(char *str, int n, char *format, va_list ap);
int smbrun(char *cmd,char *outfile,BOOL shared);
+/*The following definitions come from lib/snprintf.c */
+
+
/*The following definitions come from lib/system.c */
int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c
index d51627a1e3..467f914244 100644
--- a/source3/lib/snprintf.c
+++ b/source3/lib/snprintf.c
@@ -707,7 +707,7 @@ static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c)
#endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */
#ifndef HAVE_VSNPRINTF
-int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+ int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
{
str[0] = 0;
dopr(str, count, fmt, args);
@@ -718,9 +718,9 @@ int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
#ifndef HAVE_SNPRINTF
/* VARARGS3 */
#ifdef HAVE_STDARGS
-int snprintf (char *str,size_t count,const char *fmt,...)
+ int snprintf (char *str,size_t count,const char *fmt,...)
#else
-int snprintf (va_alist) va_dcl
+ int snprintf (va_alist) va_dcl
#endif
{
#ifndef HAVE_STDARGS
@@ -749,7 +749,7 @@ int snprintf (va_alist) va_dcl
#ifndef LONG_STRING
#define LONG_STRING 1024
#endif
-int main (void)
+ int main (void)
{
char buf1[LONG_STRING];
char buf2[LONG_STRING];