summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@abc39116-655e-4be6-ad55-d661dc543056>2008-07-25 00:46:00 +0000
committerroot <root@abc39116-655e-4be6-ad55-d661dc543056>2008-07-25 00:46:00 +0000
commit9483c94352b0182580972e7cac2ba585022398d5 (patch)
treea1f78cb941b5359fde0e04b9006c33ade1402085
parent49d89e73d077c399cd85dcbbd623e08c59547304 (diff)
downloadpython-dmidecode-9483c94352b0182580972e7cac2ba585022398d5.tar.gz
python-dmidecode-9483c94352b0182580972e7cac2ba585022398d5.tar.xz
python-dmidecode-9483c94352b0182580972e7cac2ba585022398d5.zip
Cleaner to not vsprintf() at all if `format' is NULL.
git-svn-id: svn://svn.autonomy.net.au/python-dmidecode@17 abc39116-655e-4be6-ad55-d661dc543056
-rw-r--r--catsprintf.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/catsprintf.c b/catsprintf.c
index e914e6d..d9d73ff 100644
--- a/catsprintf.c
+++ b/catsprintf.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
#include "catsprintf.h"
static const int map_maj[] = {
@@ -65,7 +66,9 @@ dmi_minor* dmiAppendObject(long code, char const *key, const char *format, ...)
o->id = code;
o->major = (dmi_codes_major *)&dmiCodesMajor[map_maj[code>>8]];
o->key = (char *)key;
- vsprintf(o->value, format, arg);
+ if (format != NULL)
+ vsprintf(o->value, format, arg);
+
o->next = last;
va_end(arg); /* cleanup */