Changeset 89ac5513 in mainline for uspace/lib/usb/src/dev.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/usb/src/dev.c (modified) (3 diffs)

uspace/lib/usb/src/dev.c

@@ -114 +114 @@
 
 static bool try_parse_bus_and_address(const char *path,
-    char **func_start,
+    const char **func_start,
     devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
 {
@@ -120 +120 @@
         size_t address;
         int rc;
-        char *ptr;
+        const char *ptr;
 
         rc = str_uint64_t(path, &ptr, 10, false, &sid);
@@ -188 +188 @@
         int rc;
         bool is_bus_addr;
-        char *func_start = NULL;
+        const char *func_start = NULL;
         char *path = NULL;