error: Strip trailing '\n' from error string arguments (again)

Commit 9af9e0f, 6daf194d, be62a2eb and 312fd5f got rid of a bunch, but
they keep coming back.  checkpatch.pl tries to flag them since commit
5d596c2, but it's not very good at it.  Offenders tracked down with
Coccinelle script scripts/coccinelle/err-bad-newline.cocci, an updated
version of the script from commit 312fd5f.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1470224274-31522-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2016-08-03 13:37:51 +02:00
parent 51009170d8
commit df3c286c53
7 changed files with 39 additions and 10 deletions

View File

@ -73,7 +73,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
for (i = 0; i < s->num_vp; i++) { for (i = 0; i < s->num_vp; i++) {
cpu = cpu_mips_init(s->cpu_model); cpu = cpu_mips_init(s->cpu_model);
if (cpu == NULL) { if (cpu == NULL) {
error_setg(errp, "%s: CPU initialization failed\n", __func__); error_setg(errp, "%s: CPU initialization failed", __func__);
return; return;
} }

View File

@ -744,7 +744,7 @@ static int get_fw_cfg_order(FWCfgState *s, const char *name)
} }
/* Stick unknown stuff at the end. */ /* Stick unknown stuff at the end. */
error_report("warning: Unknown firmware file in legacy mode: %s\n", name); error_report("warning: Unknown firmware file in legacy mode: %s", name);
return FW_CFG_ORDER_OVERRIDE_LAST; return FW_CFG_ORDER_OVERRIDE_LAST;
} }

View File

@ -234,7 +234,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
} }
if (cc->core_id % smp_threads) { if (cc->core_id % smp_threads) {
error_setg(&local_err, "invalid core id %d\n", cc->core_id); error_setg(&local_err, "invalid core id %d", cc->core_id);
goto out; goto out;
} }

View File

@ -3490,7 +3490,7 @@ typedef struct BenchData {
static void bench_undrained_flush_cb(void *opaque, int ret) static void bench_undrained_flush_cb(void *opaque, int ret)
{ {
if (ret < 0) { if (ret < 0) {
error_report("Failed flush request: %s\n", strerror(-ret)); error_report("Failed flush request: %s", strerror(-ret));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
@ -3501,7 +3501,7 @@ static void bench_cb(void *opaque, int ret)
BlockAIOCB *acb; BlockAIOCB *acb;
if (ret < 0) { if (ret < 0) {
error_report("Failed request: %s\n", strerror(-ret)); error_report("Failed request: %s", strerror(-ret));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

View File

@ -0,0 +1,29 @@
// Error messages should not contain newlines. This script finds
// messages that do. Fixing them is manual.
@r@
expression errp, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_setg(errp, fmt, ...)@p
|
error_setg_errno(errp, eno, fmt, ...)@p
|
error_setg_win32(errp, eno, cls, fmt, ...)@p
|
error_prepend(errp, fmt, ...)@p
|
error_setg_file_open(errp, eno, cls, fmt, ...)@p
|
error_reportf_err(errp, fmt, ...)@p
|
error_set(errp, cls, 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)

View File

@ -1197,8 +1197,8 @@ static void slirp_socket_save(QEMUFile *f, struct socket *so)
qemu_put_be16(f, so->so_fport); qemu_put_be16(f, so->so_fport);
break; break;
default: default:
error_report( error_report("so_ffamily unknown, unable to save so_faddr and"
"so_ffamily unknown, unable to save so_faddr and so_fport\n"); " so_fport");
} }
qemu_put_be16(f, so->so_lfamily); qemu_put_be16(f, so->so_lfamily);
switch (so->so_lfamily) { switch (so->so_lfamily) {
@ -1207,8 +1207,8 @@ static void slirp_socket_save(QEMUFile *f, struct socket *so)
qemu_put_be16(f, so->so_lport); qemu_put_be16(f, so->so_lport);
break; break;
default: default:
error_report( error_report("so_ffamily unknown, unable to save so_laddr and"
"so_ffamily unknown, unable to save so_laddr and so_lport\n"); " so_lport");
} }
qemu_put_byte(f, so->so_iptos); qemu_put_byte(f, so->so_iptos);
qemu_put_byte(f, so->so_emu); qemu_put_byte(f, so->so_emu);

View File

@ -3250,7 +3250,7 @@ int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
if (machine_kernel_irqchip_split(ms)) { if (machine_kernel_irqchip_split(ms)) {
ret = kvm_vm_enable_cap(s, KVM_CAP_SPLIT_IRQCHIP, 0, 24); ret = kvm_vm_enable_cap(s, KVM_CAP_SPLIT_IRQCHIP, 0, 24);
if (ret) { if (ret) {
error_report("Could not enable split irqchip mode: %s\n", error_report("Could not enable split irqchip mode: %s",
strerror(-ret)); strerror(-ret));
exit(1); exit(1);
} else { } else {