[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/2] block/qapi: make two printf() formats literal
From: |
Peter Xu |
Subject: |
[Qemu-block] [PATCH 1/2] block/qapi: make two printf() formats literal |
Date: |
Wed, 9 Mar 2016 13:56:36 +0800 |
Fix two places to use literal printf format when possible.
Signed-off-by: Peter Xu <address@hidden>
---
block/qapi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index db2d3fb..c4c2115 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -619,9 +619,8 @@ static void dump_qlist(fprintf_function func_fprintf, void
*f, int indentation,
for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) {
QType type = qobject_type(entry->value);
bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
- const char *format = composite ? "%*s[%i]:\n" : "%*s[%i]: ";
-
- func_fprintf(f, format, indentation * 4, "", i);
+ func_fprintf(f, "%*s[%i]:%c", indentation * 4, "", i,
+ composite ? '\n' : ' ');
dump_qobject(func_fprintf, f, indentation + 1, entry->value);
if (!composite) {
func_fprintf(f, "\n");
@@ -637,7 +636,6 @@ static void dump_qdict(fprintf_function func_fprintf, void
*f, int indentation,
for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) {
QType type = qobject_type(entry->value);
bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
- const char *format = composite ? "%*s%s:\n" : "%*s%s: ";
char key[strlen(entry->key) + 1];
int i;
@@ -646,8 +644,8 @@ static void dump_qdict(fprintf_function func_fprintf, void
*f, int indentation,
key[i] = entry->key[i] == '-' ? ' ' : entry->key[i];
}
key[i] = 0;
-
- func_fprintf(f, format, indentation * 4, "", key);
+ func_fprintf(f, "%*s%s:%c", indentation * 4, "", key,
+ composite ? '\n' : ' ');
dump_qobject(func_fprintf, f, indentation + 1, entry->value);
if (!composite) {
func_fprintf(f, "\n");
--
2.4.3
[Qemu-block] [PATCH 2/2] block/qapi: fix unbounded stack for dump_qdict, Peter Xu, 2016/03/09
Re: [Qemu-block] [Qemu-devel] [PATCH 0/2] block/qapi: trivial fixes, Markus Armbruster, 2016/03/22