From 14789b7ea8514ad34059a11873e5eef3931c385c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 12 May 2017 16:29:15 +0200 Subject: [PATCH] util: conf: Don't log when adding commented out lines virConfAddEntry spams debug logs even for fully commented out lines. Skip such messages to avoid: 2017-05-12 12:35:38.867+0000: 10820: debug : virConfAddEntry:241 : Add entry (null) (nil) 2017-05-12 12:35:38.867+0000: 10820: debug : virConfAddEntry:241 : Add entry (null) (nil) 2017-05-12 12:35:38.867+0000: 10820: debug : virConfAddEntry:241 : Add entry (null) (nil) 2017-05-12 12:35:38.867+0000: 10820: debug : virConfAddEntry:241 : Add entry (null) (nil) 2017-05-12 12:35:38.867+0000: 10820: debug : virConfAddEntry:241 : Add entry (null) (nil) ... This also fixes NULL passed to printf. --- src/util/virconf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 9840ca6c7d..4498d253a4 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -238,7 +238,10 @@ virConfAddEntry(virConfPtr conf, char *name, virConfValuePtr value, char *comm) if ((comm == NULL) && (name == NULL)) return NULL; - VIR_DEBUG("Add entry %s %p", name, value); + /* don't log fully commented out lines */ + if (name) + VIR_DEBUG("Add entry %s %p", name, value); + if (VIR_ALLOC(ret) < 0) return NULL; -- 2.47.2