Changeset cf56332 in mainline

Timestamp:

2012-08-17T22:18:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1cf0a17

Parents:

0d7eb0f

Message:

isa: Minor refactoring.

File:

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

uspace/drv/bus/isa/isa.c

@@ -268 +268 @@
 {
         char *line = str;
+        *next = NULL;
 
         if (str == NULL) {
-                *next = NULL;
                 return NULL;
         }
@@ -280 +280 @@
         if (*str != '\0') {
                 *next = str + 1;
-        } else {
-                *next = NULL;
         }
 
@@ -446 +444 @@
 {
         char *id = NULL;
-        int score = 0;
         char *end = NULL;
-        int rc;
 
         val = skip_spaces(val);
 
-        score = (int)strtol(val, &end, 10);
+        int score = (int)strtol(val, &end, 10);
         if (val == end) {
                 ddf_msg(LVL_ERROR, "Cannot read match score for function "
@@ -470 +466 @@
             "function %s", id, score, fun->fnode->name);
 
-        rc = ddf_fun_add_match_id(fun->fnode, id, score);
+        int rc = ddf_fun_add_match_id(fun->fnode, id, score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
@@ -575 +571 @@
 static int isa_dev_add(ddf_dev_t *dev)
 {
-        isa_bus_t *isa;
-
         ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
             (int) dev->handle);
 
-        isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
+        isa_bus_t *isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
         if (isa == NULL)
                 return ENOMEM;
@@ -617 +611 @@
 {
         isa_bus_t *isa = ISA_BUS(dev);
-        int rc;
 
         fibril_mutex_lock(&isa->mutex);
@@ -625 +618 @@
                     isa_fun_t, bus_link);
 
-                rc = ddf_fun_offline(fun->fnode);
+                int rc = ddf_fun_offline(fun->fnode);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&isa->mutex);