Changeset 8cc4ddb in mainline for uspace/app/sysinfo/sysinfo.c

Timestamp:

2011-08-28T21:16:54Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f0f8bc

Parents:

1a5b252 (diff), 36e2b55 (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:

• uspace/app/sysinfo/sysinfo.c (modified) (3 diffs)

uspace/app/sysinfo/sysinfo.c

@@ -51 +51 @@
         int rc;
         char *ipath;
-        sysinfo_item_tag_t tag;
+        sysinfo_item_val_type_t tag;
 
         if (argc != 2) {
@@ -60 +60 @@
         ipath = argv[1];
 
-        tag = sysinfo_get_tag(ipath);
+        tag = sysinfo_get_val_type(ipath);
 
         /* Silence warning */
@@ -75 +75 @@
         case SYSINFO_VAL_DATA:
                 rc = print_item_data(ipath);
+                break;
+        default:
+                printf("Error: Sysinfo item '%s' with unknown value type.\n",
+                    ipath);
+                rc = 2;
                 break;
         }