summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-02-09 00:50:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:52 -0500
commit4c78d1bfa21947f649b061279e7388c478f77fe0 (patch)
treedfd6a228df29e5cc7ac38bd6b16c2047543bbe87
parentb56dab83a4537175b998b137e7ea2f2558042593 (diff)
downloadsamba-4c78d1bfa21947f649b061279e7388c478f77fe0.tar.gz
samba-4c78d1bfa21947f649b061279e7388c478f77fe0.tar.bz2
samba-4c78d1bfa21947f649b061279e7388c478f77fe0.zip
r13401: remove the rename of the snprintf functions that simo accidentially
included in his last commit (This used to be commit 487b374b4359b2cb5f4e249e595c43bfa568a853)
-rw-r--r--source4/lib/replace/snprintf.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/lib/replace/snprintf.c b/source4/lib/replace/snprintf.c
index 379e15cf6d..f3eac1b9b5 100644
--- a/source4/lib/replace/snprintf.c
+++ b/source4/lib/replace/snprintf.c
@@ -1187,11 +1187,10 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
return max;
}
- int smb_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)
{
return dopr(str, count, fmt, args);
}
-#define vsnprintf smb_vsnprintf
#endif
/* yes this really must be a ||. Don't muck with this (tridge)
@@ -1201,7 +1200,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
* that doesn't work properly according to the autoconf test.
*/
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-int smb_snprintf(char *str,size_t count,const char *fmt,...)
+ int snprintf(char *str,size_t count,const char *fmt,...)
{
size_t ret;
va_list ap;
@@ -1211,7 +1210,6 @@ int smb_snprintf(char *str,size_t count,const char *fmt,...)
va_end(ap);
return ret;
}
-#define snprintf smb_snprintf
#endif
#endif