diff options
| author | Peter Xu <peterx@redhat.com> | 2016-03-09 13:56:36 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-30 11:59:32 +0200 |
| commit | 853ccfed8fe40ba97c4814b5165fda4cfeee044b (patch) | |
| tree | 4142c73f0c7903d0044df7c13f5e159aca949883 /block/qapi.c | |
| parent | 72f41b6fbd19113247f1ff46f844e9b79cbd5e48 (diff) | |
| download | qemu-853ccfed8fe40ba97c4814b5165fda4cfeee044b.zip qemu-853ccfed8fe40ba97c4814b5165fda4cfeee044b.tar.gz qemu-853ccfed8fe40ba97c4814b5165fda4cfeee044b.tar.bz2 | |
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>
Diffstat (limited to 'block/qapi.c')
| -rw-r--r-- | block/qapi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/block/qapi.c b/block/qapi.c index 089614e..e0e6e96 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -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++) { 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"); @@ -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)) { 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; @@ -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] = 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"); |