Changeset ef9460b in mainline

Timestamp:

2011-07-14T21:55:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

333c233

Parents:

159100a

Message:

ddf_fun_add_match_id() should copy its string argument.

Location:

uspace

Files:

• drv/bus/isa/isa.c (modified) (1 diff)
• drv/bus/pci/pciintel/pci.c (modified) (1 diff)
• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/root_hub.c (modified) (1 diff)
• drv/infrastructure/root/root.c (modified) (1 diff)
• drv/test/test1/test1.c (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -352 +352 @@
                     str_error(rc));
         }
+
+        free(id);
 }
 

uspace/drv/bus/pci/pciintel/pci.c

@@ -342 +342 @@
         }
         
+        free(match_id_str);
+        
         /* TODO add more ids (with subsys ids, using class id etc.) */
 }

uspace/drv/bus/usb/ohci/hc.c

@@ -151 +151 @@
             "Failed to add OHCI root hub endpoint 0: %s.\n", str_error(ret));
 
-        char *match_str = NULL;
-        /* DDF needs heap allocated string. */
-        ret = asprintf(&match_str, "usb&class=hub");
-        ret = ret > 0 ? 0 : ret;
-        CHECK_RET_RELEASE(ret,
-            "Failed to create match-id string: %s.\n", str_error(ret));
-
-        ret = ddf_fun_add_match_id(hub_fun, match_str, 100);
+        ret = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
         CHECK_RET_RELEASE(ret,
             "Failed to add root hub match-id: %s.\n", str_error(ret));

uspace/drv/bus/usb/uhci/root_hub.c

@@ -50 +50 @@
 int rh_init(rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
 {
+        int ret;
+
         assert(fun);
 
-        char *match_str = NULL;
-        int ret = asprintf(&match_str, "usb&uhci&root-hub");
-        if (ret < 0) {
-                usb_log_error("Failed to create root hub match string: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        assert(match_str);
-
-        ret = ddf_fun_add_match_id(fun, match_str, 100);
+        ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
         if (ret != EOK) {
-                free(match_str);
                 usb_log_error("Failed to add root hub match id: %s\n",
                     str_error(ret));

uspace/drv/infrastructure/root/root.c

@@ -176 +176 @@
         }
 
+        free(match_id);
+
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {

uspace/drv/test/test1/test1.c

@@ -74 +74 @@
         }
 
-        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
+        rc = ddf_fun_add_match_id(fun, match_id, match_score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",

uspace/lib/drv/generic/driver.c

@@ -620 +620 @@
                 return ENOMEM;
         
-        match_id->id = match_id_str;
+        match_id->id = str_dup(match_id_str);
         match_id->score = 90;