ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/qapi: make two printf() formats literal 

Fix two places to use literal printf format when possible.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Peter Xu 2016-03-09 13:56:36 +08:00 committed by Kevin Wolf
parent 72f41b6fbd
commit 853ccfed8f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/qapi.c
View File

@ -652,9 +652,8 @@ static void dump_qlist(fprintf_function func_fprintf, void *f, int indentation,
for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) { for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) {
QType type = qobject_type(entry->value); QType type = qobject_type(entry->value);
bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
const char *format = composite ? "%*s[%i]:\n" : "%*s[%i]: "; func_fprintf(f, "%*s[%i]:%c", indentation * 4, "", i,
composite ? '\n' : ' ');
func_fprintf(f, format, indentation * 4, "", i);
dump_qobject(func_fprintf, f, indentation + 1, entry->value); dump_qobject(func_fprintf, f, indentation + 1, entry->value);
if (!composite) { if (!composite) {
func_fprintf(f, "\n"); func_fprintf(f, "\n");
@ -670,7 +669,6 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation,
for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) { for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) {
QType type = qobject_type(entry->value); QType type = qobject_type(entry->value);
bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
const char *format = composite ? "%*s%s:\n" : "%*s%s: ";
char key[strlen(entry->key) + 1]; char key[strlen(entry->key) + 1];
int i; int i;
@ -679,8 +677,8 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation,
key[i] = entry->key[i] == '-' ? ' ' : entry->key[i]; key[i] = entry->key[i] == '-' ? ' ' : entry->key[i];
} }
key[i] = 0; key[i] = 0;
func_fprintf(f, "%*s%s:%c", indentation * 4, "", key,
func_fprintf(f, format, indentation * 4, "", key); composite ? '\n' : ' ');
dump_qobject(func_fprintf, f, indentation + 1, entry->value); dump_qobject(func_fprintf, f, indentation + 1, entry->value);
if (!composite) { if (!composite) {
func_fprintf(f, "\n"); func_fprintf(f, "\n");