summaryrefslogtreecommitdiff
path: root/source/lib/util_tdb.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-02-25 15:24:49 +0100
committerVolker Lendecke <vl@samba.org>2008-02-25 16:09:26 +0100
commitad37b7b0aee265a3e4d8b7552610f4b9a105434d (patch)
tree56230430209f118f60cae5379b14576cc55590c4 /source/lib/util_tdb.c
parent71641f04d4e9a41775e898f2e4ac3c8792783cd3 (diff)
downloadsamba-ad37b7b0aee265a3e4d8b7552610f4b9a105434d.tar.gz
Fix some warnings
warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result
Diffstat (limited to 'source/lib/util_tdb.c')
-rw-r--r--source/lib/util_tdb.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/source/lib/util_tdb.c b/source/lib/util_tdb.c
index dd5ebcd7ab5..724832ea5bb 100644
--- a/source/lib/util_tdb.c
+++ b/source/lib/util_tdb.c
@@ -669,12 +669,13 @@ static void tdb_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, const char *fo
{
va_list ap;
char *ptr = NULL;
+ int ret;
va_start(ap, format);
- vasprintf(&ptr, format, ap);
+ ret = vasprintf(&ptr, format, ap);
va_end(ap);
- if (!ptr || !*ptr)
+ if ((ret == -1) || !*ptr)
return;
DEBUG((int)level, ("tdb(%s): %s", tdb_name(tdb) ? tdb_name(tdb) : "unnamed", ptr));
@@ -867,11 +868,8 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level,
va_list ap;
char *ptr = NULL;
int debuglevel = 0;
+ int ret;
- va_start(ap, format);
- vasprintf(&ptr, format, ap);
- va_end(ap);
-
switch (level) {
case TDB_DEBUG_FATAL:
debug_level = 0;
@@ -889,7 +887,11 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level,
debuglevel = 0;
}
- if (ptr != NULL) {
+ va_start(ap, format);
+ ret = vasprintf(&ptr, format, ap);
+ va_end(ap);
+
+ if (ret != -1) {
const char *name = tdb_name(tdb);
DEBUG(debuglevel, ("tdb(%s): %s", name ? name : "unnamed", ptr));
free(ptr);