Changeset e7df6cd in mainline

Timestamp:

2011-04-12T16:04:30Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

56f8a04

Parents:

777e336

Message:

Added some asserts to static functions

File:

• uspace/drv/usbhid/usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/usbhid.c

@@ -67 +67 @@
 static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -97 +97 @@
 static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -127 +127 @@
 static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -232 +232 @@
 static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
 {
+        assert(hid_dev != NULL);
+        
         const usb_hid_subdriver_t *subdrivers[USB_HID_MAX_SUBDRIVERS];
         
@@ -286 +288 @@
 static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
+        assert(hid_dev != NULL && dev != NULL);
+        
         int rc = EOK;