[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 3/6] opts: do not print separator before first it
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-block] [PATCH v2 3/6] opts: do not print separator before first item in qemu_opts_print |
Date: |
Tue, 16 Jun 2015 14:49:06 +0200 |
This allows to print options in a format that the user would actually write it
on the command line (foo=bar,baz=asd,etc=def), without prepending a spurious
comma at the beginning of the list.
Only block.c depended on the old behavior, but it was also updated.
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
block.c | 2 +-
util/qemu-option.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index dd4f58d..c5d456c 100644
--- a/block.c
+++ b/block.c
@@ -3823,7 +3823,7 @@ void bdrv_img_create(const char *filename, const char
*fmt,
}
if (!quiet) {
- printf("Formatting '%s', fmt=%s", filename, fmt);
+ printf("Formatting '%s', fmt=%s ", filename, fmt);
qemu_opts_print(opts, " ");
puts("");
}
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 840f5f7..b347d92 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -728,14 +728,16 @@ void qemu_opts_del(QemuOpts *opts)
g_free(opts);
}
-void qemu_opts_print(QemuOpts *opts, const char *sep)
+void qemu_opts_print(QemuOpts *opts, const char *d_sep)
{
QemuOpt *opt;
QemuOptDesc *desc = opts->list->desc;
+ const char *sep = "";
if (desc[0].name == NULL) {
QTAILQ_FOREACH(opt, &opts->head, next) {
printf("%s%s=\"%s\"", sep, opt->name, opt->str);
+ sep = d_sep;
}
return;
}
@@ -755,6 +757,7 @@ void qemu_opts_print(QemuOpts *opts, const char *sep)
} else {
printf("%s%s=%s", sep, desc->name, value);
}
+ sep = d_sep;
}
}
--
2.4.3
- [Qemu-block] [PATCH v2 3/6] opts: do not print separator before first item in qemu_opts_print,
Kővágó, Zoltán <=