- added test for vasprintf

- cleaned up GNUC printf attribute macros
- added enum handling in mkproto
- removed non-vararg code
- made slprintf and vslprintf just macros for snprintf and vsnprintf
- don't need slprintf code any more
(This used to be commit c7aeb2254dfc3cd0aa0b6c0bdd426f9323be0ddf)

1 files changed, 0 insertions, 71 deletions

diff --git a/source3/lib/slprintf.c b/source3/lib/slprintf.c
index be81b4aa12..2a72fcffc3 100644
--- a/source3/lib/slprintf.c
+++ b/source3/lib/slprintf.c
@@ -22,74 +22,3 @@
 #include "includes.h"
 
 extern int DEBUGLEVEL;
-
-
-/* this is like vsnprintf but the 'n' limit does not include
-   the terminating null. So if you have a 1024 byte buffer then
-   pass 1023 for n */
-int vslprintf(char *str, int n, char *format, va_list ap)
-{
-	int ret = vsnprintf(str, n, format, ap);
-	if (ret > n || ret < 0) {
-		str[n] = 0;
-		return -1;
-	}
-	str[ret] = 0;
-	return ret;
-}
-
-#ifdef HAVE_STDARG_H
- int slprintf(char *str, int n, char *format, ...)
-{
-#else
- int slprintf(va_alist)
-va_dcl
-{
-	char *str, *format;
-	int n;
-#endif
-	va_list ap;  
-	int ret;
-
-#ifdef HAVE_STDARG_H
-	va_start(ap, format);
-#else
-	va_start(ap);
-	str = va_arg(ap,char *);
-	n = va_arg(ap,int);
-	format = va_arg(ap,char *);
-#endif
-
-	ret = vslprintf(str,n,format,ap);
-	va_end(ap);
-	return ret;
-}
-
- /* this is rather line fprintf, except that it works on a file descriptor
-    and is limited to one pstring of output */
-#ifdef HAVE_STDARG_H
- int fdprintf(int fd, char *format, ...)
-{
-#else
- int fdprintf(va_alist)
-va_dcl
-{
-	int fd;
-	char *format;
-#endif
-	va_list ap;  
-	pstring str;
-
-#ifdef HAVE_STDARG_H
-	va_start(ap, format);
-#else
-	va_start(ap);
-	fd = va_arg(ap,int);
-	format = va_arg(ap,char *);
-#endif
-	str[0] = 0;
-
-	vslprintf(str,sizeof(str),format,ap);
-	va_end(ap);
-	return write(fd, str, strlen(str));
-}