DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

Misc code cleanups

Browse Source 
Simplifying things, adding a bit of error checking, etc.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2015-09-03 08:12:34 +10:00
parent a1935a76ac
commit 2bcfb825c0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libratbag.c
View File

@@ -100,10 +100,7 @@ log_buffer(struct ratbag *ratbag,
output_buf = zalloc(buf_len);
if (!output_buf) {
if (header)
log_msg(ratbag, priority, "%s ......", header);
else
log_msg(ratbag, priority, " ......");
log_msg(ratbag, priority, "%s ......", header ? header : "");
return;
}
@@ -125,6 +122,18 @@ LIBRATBAG_EXPORT void
ratbag_log_set_priority(struct ratbag *ratbag,
enum ratbag_log_priority priority)
{
switch (priority) {
case RATBAG_LOG_PRIORITY_RAW:
case RATBAG_LOG_PRIORITY_DEBUG:
case RATBAG_LOG_PRIORITY_INFO:
case RATBAG_LOG_PRIORITY_ERROR:
break;
default:
log_bug_client(ratbag,
"Invalid log priority %d. Using INFO instead\n",
priority);
return;
}
ratbag->log_priority = priority;
}
@@ -364,7 +373,7 @@ ratbag_device_new_from_udev_device(struct ratbag *ratbag,
device->ratbag = ratbag_ref(ratbag);
if (get_product_id(udev_device, &device->ids) != 0)
goto out_err;
free(device->name);
device->name = get_device_name(udev_device);
if (!device->name) {
errno = ENOMEM;