Changeset 00aece0 in mainline for uspace/lib/usbhid/src/hidpath.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (2 diffs)

uspace/lib/usbhid/src/hidpath.c

@@ -76 +76 @@
                                     int32_t usage_page, int32_t usage)
 {       
-        usb_hid_report_usage_path_t *item;
-
-        if(!(item=malloc(sizeof(usb_hid_report_usage_path_t)))) {
+        usb_hid_report_usage_path_t *item
+                = malloc(sizeof(usb_hid_report_usage_path_t));
+
+        if (item == NULL) {
                 return ENOMEM;
         }
@@ -384 +385 @@
 void usb_hid_report_path_free(usb_hid_report_path_t *path)
 {
+        if (path == NULL)
+                return;
         while(!list_empty(&path->items)){
                 usb_hid_report_remove_last_item(path);