BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

device: Cosmetics.

This commit is contained in:
Uwe Hermann 2013-01-29 12:55:00 +01:00
parent d3b38ad389
commit c4227fc637
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
device.c
View File

@ -217,7 +217,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) { if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
sr_err("%s: sdi malloc failed", __func__); sr_err("Device instance malloc failed.");
return NULL; return NULL;
} }
@ -263,7 +263,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
struct sr_usb_dev_inst *udi; struct sr_usb_dev_inst *udi;
if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) { if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) {
sr_err("%s: udi malloc failed", __func__); sr_err("USB device instance malloc failed.");
return NULL; return NULL;
} }
@ -302,12 +302,12 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
if (!port) { if (!port) {
sr_err("hwdriver: serial port required"); sr_err("Serial port required.");
return NULL; return NULL;
} }
if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) { if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) {
sr_err("hwdriver: serial malloc failed"); sr_err("Serial device instance malloc failed.");
return NULL; return NULL;
} }
@ -322,16 +322,13 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
/** @private */ /** @private */
SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial) SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
{ {
g_free(serial->port); g_free(serial->port);
g_free(serial->serialcomm); g_free(serial->serialcomm);
g_free(serial); g_free(serial);
} }
SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver) SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
{ {
if (driver && driver->dev_list) if (driver && driver->dev_list)
return driver->dev_list(); return driver->dev_list();
else else
@ -340,7 +337,6 @@ SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver) SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
{ {
if (driver && driver->dev_clear) if (driver && driver->dev_clear)
return driver->dev_clear(); return driver->dev_clear();
else else