Changeset 3d4ad475 in mainline

Timestamp:

2012-08-17T17:58:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5f305b

Parents:

1de97fe6

Message:

isa: Do not allocate and copy name string.

ddf_fun_create does that for us.

File:

• uspace/drv/bus/isa/isa.c (modified) (3 diffs)

uspace/drv/bus/isa/isa.c

@@ -308 +308 @@
         /* Get the name part of the rest of the line. */
         strtok(line, ":");
-
-        /* Allocate output buffer. */
-        size_t size = str_size(line) + 1;
-        char *name = malloc(size);
-
-        if (name != NULL) {
-                /* Copy the result to the output buffer. */
-                str_cpy(name, size, line);
-        }
-
-        return name;
+        return line;
 }
 
@@ -524 +514 @@
 {
         char *line;
-        char *fun_name = NULL;
 
         /* Skip empty lines. */
@@ -538 +527 @@
 
         /* Get device name. */
-        fun_name = get_device_name(line);
+        const char *fun_name = get_device_name(line);
         if (fun_name == NULL)
                 return NULL;
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
-        free(fun_name);
         if (fun == NULL) {
                 return NULL;