Changeset 33b8d024 in mainline for uspace/drv

Timestamp:

2018-01-16T20:38:46Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

2467b41

Parents:

d39c46e0

Message:

Remove const qualifier from the argument of free() and realloc(),
as well as in numerous other variables that hold ownership of memory.

By convention, a pointer that holds ownership is _never_ qualified by const.
This is reflected in the standard type signature of free() and realloc().
Allowing const pointers to hold ownership may seem superficially convenient,
but is actually quite confusing to experienced C programmers.

Location:

uspace/drv

Files:

• bus/usb/vhc/hub/virthub.c (modified) (1 diff)
• platform/amdm37x/main.c (modified) (3 diffs)

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -156 +156 @@
         dev->descriptors = &descriptors;
         dev->address = 0;
-        dev->name = str_dup(name);
-        if (!dev->name)
+
+        char *n = str_dup(name);
+        if (!n)
                 return ENOMEM;
 
         hub_t *hub = malloc(sizeof(hub_t));
         if (hub == NULL) {
-                free(dev->name);
+                free(n);
                 return ENOMEM;
         }
 
+        dev->name = n;
         hub_init(hub);
         dev->device_data = hub;

uspace/drv/platform/amdm37x/main.c

@@ -49 +49 @@
 typedef struct {
         const char *name;
-        match_id_t match_id;
+        const char *id;
+        int score;
         hw_resource_list_t hw_resources;
 } amdm37x_fun_t;
@@ -133 +134 @@
 {
         .name = "ohci",
-        .match_id = { .id = "usb/host=ohci", .score = 90 },
+        .id = "usb/host=ohci",
+        .score = 90,
         .hw_resources = { .resources = ohci_res, .count = ARRAY_SIZE(ohci_res) }
 },
 {
         .name = "ehci",
-        .match_id = { .id = "usb/host=ehci", .score = 90 },
+        .id = "usb/host=ehci",
+        .score = 90,
         .hw_resources = { .resources = ehci_res, .count = ARRAY_SIZE(ehci_res) }
 },
 {
         .name = "fb",
-        .match_id = { .id = "amdm37x&dispc", .score = 90 },
+        .id = "amdm37x&dispc",
+        .score = 90,
         .hw_resources = { .resources = disp_res, .count = ARRAY_SIZE(disp_res) }
 },
@@ -174 +178 @@
         
         /* Add match id */
-        errno_t ret = ddf_fun_add_match_id(fnode,
-            fun->match_id.id, fun->match_id.score);
+        errno_t ret = ddf_fun_add_match_id(fnode, fun->id, fun->score);
         if (ret != EOK) {
                 ddf_fun_destroy(fnode);