From 312fd5f29097890179793d8bbb59ab18afbe0ad4 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 8 Feb 2013 21:22:16 +0100 Subject: error: Strip trailing '\n' from error string arguments (again) Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming back. Tracked down with this Coccinelle semantic patch: @r@ expression err, eno, cls, fmt; position p; @@ ( error_report(fmt, ...)@p | error_set(err, cls, fmt, ...)@p | error_set_errno(err, eno, cls, fmt, ...)@p | error_setg(err, fmt, ...)@p | error_setg_errno(err, eno, fmt, ...)@p ) @script:python@ fmt << r.fmt; p << r.p; @@ if "\\n" in str(fmt): print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt) Signed-off-by: Markus Armbruster Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori --- util/qemu-config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/qemu-config.c') diff --git a/util/qemu-config.c b/util/qemu-config.c index 47c81f72d3..db6ec03a78 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -29,7 +29,7 @@ QemuOptsList *qemu_find_opts(const char *group) ret = find_list(vm_config_groups, group, &local_err); if (error_is_set(&local_err)) { - error_report("%s\n", error_get_pretty(local_err)); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); } @@ -153,7 +153,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) /* group with id */ list = find_list(lists, group, &local_err); if (error_is_set(&local_err)) { - error_report("%s\n", error_get_pretty(local_err)); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); goto out; } @@ -164,7 +164,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) /* group without id */ list = find_list(lists, group, &local_err); if (error_is_set(&local_err)) { - error_report("%s\n", error_get_pretty(local_err)); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); goto out; } -- cgit v1.2.3-55-g7522