Changeset 4125b7d in mainline for uspace/lib/usb/src

Timestamp:

2011-04-18T20:06:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

84a04dd, bbdf09e

Parents:

5ab4a48

Message:

usb_log_printf() checks for printf correctness

It is surprising how many printf warnings simple check could
produce .

Next time, it won't compile. Bad, huh?

Location:

uspace/lib/usb/src

Files:

• devpoll.c (modified) (3 diffs)
• hidparser.c (modified) (2 diffs)
• hidreport.c (modified) (2 diffs)

uspace/lib/usb/src/devpoll.c

@@ -78 +78 @@
                 usb_endpoint_mapping_t *mapping
                     = &polling_data->dev->pipes[polling_data->pipe_index];
-                usb_log_debug("Poll0x%x: started polling of `%s' - " \
+                usb_log_debug("Poll%p: started polling of `%s' - " \
                     "interface %d (%s,%d,%d), %zuB/%zu.\n",
                     polling_data,
@@ -100 +100 @@
                         if (rc == EOK) {
                                 usb_log_debug(
-                                    "Poll0x%x: received: '%s' (%zuB).\n",
+                                    "Poll%p: received: '%s' (%zuB).\n",
                                     polling_data,
                                     usb_debug_str_buffer(polling_data->buffer,
@@ -107 +107 @@
                         } else {
                                 usb_log_debug(
-                                    "Poll0x%x: polling failed: %s.\n",
+                                    "Poll%p: polling failed: %s.\n",
                                     polling_data, str_error(rc));
                         }

uspace/lib/usb/src/hidparser.c

@@ -167 +167 @@
 
                         usb_log_debug2(
-                                "i(%u) data(%X) value(%X): TAG %u, class %u, size %u - ", i, 
+                                "i(%zu) data(%X) value(%X): TAG %d, class %u, size %u - ", i,
                             data[i], usb_hid_report_tag_data_int32(data+i+1,item_size), 
                             tag, class, item_size);
@@ -576 +576 @@
                 report_item = list_get_instance(item, usb_hid_report_item_t, link);
 
-                usb_log_debug("\tOFFSET: %X\n", report_item->offset);
+                usb_log_debug("\tOFFSET: %zX\n", report_item->offset);
                 usb_log_debug("\tCOUNT: %X\n", report_item->count);
                 usb_log_debug("\tSIZE: %X\n", report_item->size);

uspace/lib/usb/src/hidreport.c

@@ -109 +109 @@
         
         if (*d != sizeof(usb_standard_hid_descriptor_t)) {
-                usb_log_error("HID descriptor hass wrong size (%u, expected %u"
+                usb_log_error("HID descriptor has wrong size (%u, expected %zu"
                     ")\n", *d, sizeof(usb_standard_hid_descriptor_t));
                 return EINVAL;
@@ -149 +149 @@
                 free(*report_desc);
                 *report_desc = NULL;
-                usb_log_error("Report descriptor has wrong size (%u, expected "
+                usb_log_error("Report descriptor has wrong size (%zu, expected "
                     "%u)\n", actual_size, length);
                 return EINVAL;