sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-23 01:44:20 +03:00
Code Activity

use talloc_vasprintf

Browse Source 
(This used to be ctdb commit e259620d416497fba5ac43a87f3be7b280c21409)
This commit is contained in:
Peter Somogyi
2007-04-20 17:04:00 +02:00
parent 981a5f9d30
commit eb20281bb4
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ctdb/lib/util/debug.c
View File

@@ -22,21 +22,6 @@
#include "system/time.h" #include "system/time.h"
#include <unistd.h> #include <unistd.h>
static int vasprintf2(char **ptr, const char *format, va_list ap)
{
int ret;
va_list tmp_ap;
va_copy(tmp_ap, ap);
ret = vsnprintf(NULL, 0, format, tmp_ap);
if (ret <= 0) return ret;
(*ptr) = (char *)malloc(ret+1);
if (!*ptr) return -1;
ret = vsnprintf(*ptr, ret+1, format, ap);
return ret;
}
void do_debug(const char *format, ...) void do_debug(const char *format, ...)
{ {
@@ -45,12 +30,12 @@ void do_debug(const char *format, ...)
char *s = NULL; char *s = NULL;
va_start(ap, format); va_start(ap, format);
vasprintf2(&s, format, ap); s = talloc_vasprintf(NULL, format, ap);
va_end(ap); va_end(ap);
gettimeofday(&tm, NULL); gettimeofday(&tm, NULL);
printf("%-8.8d.%-6.6d [%d]: %s", (int)tm.tv_sec, (int)tm.tv_usec, printf("%-8.8d.%-6.6d [%d]: %s", (int)tm.tv_sec, (int)tm.tv_usec,
(int)getpid(), s); (int)getpid(), s);
fflush(stdout); fflush(stdout);
free(s); talloc_free(s);
} }