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 --- block/gluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'block/gluster.c') diff --git a/block/gluster.c b/block/gluster.c index 0f2c32a3fa..ccd684d360 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -217,7 +217,7 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) ret = glfs_init(glfs); if (ret) { error_report("Gluster connection failed for server=%s port=%d " - "volume=%s image=%s transport=%s\n", gconf->server, gconf->port, + "volume=%s image=%s transport=%s", gconf->server, gconf->port, gconf->volname, gconf->image, gconf->transport); goto out; } -- cgit v1.2.1