Changeset 7715994 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (4 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -46 +46 @@
                 return NULL;
         
-        while (subtree != NULL) {
+        while (subtree != NULL) {
                 int i = 0;
                 char *a = (char *) name;
@@ -68 +68 @@
                 /* No matches try next */
                 subtree = subtree->next;
-                i = 0;
         }
         return NULL;
@@ -159 +158 @@
                         item->subinfo_type = SYSINFO_SUBINFO_NONE;
                         return item;
-                } else {
+                } else
                         subtree = subtree->next;
-                        i = 0;
-                }       
         }
 
@@ -225 +222 @@
                 int i;
                 unative_t val = 0;
-                char *vtype = NULL;
+                const char *vtype = NULL;