mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip trailing '\n' from error_report()'s first argument (again)

Browse Source 
Commit 6daf194d got rid of them, but Hans and Gerd added some more
lately.  Tracked down with this Coccinelle semantic patch:

@r@
    expression fmt;
    position p;
@@
    error_report(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 <armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2011-12-20 18:13:08 +01:00 committed by Stefan Hajnoczi
parent d70d6b3109
commit be62a2ebab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/usb-bus.c
View File

@ -137,7 +137,7 @@ USBDevice *usb_create(USBBus *bus, const char *name)
bus = usb_bus_find(-1); bus = usb_bus_find(-1);
if (!bus) if (!bus)
return NULL; return NULL;
error_report("%s: no bus specified, using \"%s\" for \"%s\"\n", error_report("%s: no bus specified, using \"%s\" for \"%s\"",
__FUNCTION__, bus->qbus.name, name); __FUNCTION__, bus->qbus.name, name);
} }
#endif #endif
@ -152,12 +152,12 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name)
int rc; int rc;
if (!dev) { if (!dev) {
error_report("Failed to create USB device '%s'\n", name); error_report("Failed to create USB device '%s'", name);
return NULL; return NULL;
} }
rc = qdev_init(&dev->qdev); rc = qdev_init(&dev->qdev);
if (rc < 0) { if (rc < 0) {
error_report("Failed to initialize USB device '%s'\n", name); error_report("Failed to initialize USB device '%s'", name);
return NULL; return NULL;
} }
return dev; return dev;
@ -244,7 +244,7 @@ int usb_claim_port(USBDevice *dev)
} }
} }
if (port == NULL) { if (port == NULL) {
error_report("Error: usb port %s (bus %s) not found (in use?)\n", error_report("Error: usb port %s (bus %s) not found (in use?)",
dev->port_path, bus->qbus.name); dev->port_path, bus->qbus.name);
return -1; return -1;
} }
@ -255,7 +255,7 @@ int usb_claim_port(USBDevice *dev)
} }
if (bus->nfree == 0) { if (bus->nfree == 0) {
error_report("Error: tried to attach usb device %s to a bus " error_report("Error: tried to attach usb device %s to a bus "
"with no free ports\n", dev->product_desc); "with no free ports", dev->product_desc);
return -1; return -1;
} }
port = QTAILQ_FIRST(&bus->free); port = QTAILQ_FIRST(&bus->free);
@ -302,7 +302,7 @@ int usb_device_attach(USBDevice *dev)
if (!(port->speedmask & dev->speedmask)) { if (!(port->speedmask & dev->speedmask)) {
error_report("Warning: speed mismatch trying to attach " error_report("Warning: speed mismatch trying to attach "
"usb device %s to bus %s\n", "usb device %s to bus %s",
dev->product_desc, bus->qbus.name); dev->product_desc, bus->qbus.name);
return -1; return -1;
} }

4
usb-redir.c
View File

@ -174,7 +174,7 @@ static void usbredir_log(void *priv, int level, const char *msg)
return; return;
} }
error_report("%s\n", msg); error_report("%s", msg);
} }
static void usbredir_log_data(USBRedirDevice *dev, const char *desc, static void usbredir_log_data(USBRedirDevice *dev, const char *desc,
@ -193,7 +193,7 @@ static void usbredir_log_data(USBRedirDevice *dev, const char *desc,
for (j = 0; j < 8 && i + j < len; j++) { for (j = 0; j < 8 && i + j < len; j++) {
n += sprintf(buf + n, " %02X", data[i + j]); n += sprintf(buf + n, " %02X", data[i + j]);
} }
error_report("%s\n", buf); error_report("%s", buf);
} }
} }