Changeset 4627314 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2015-11-18T09:47:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d16a96f

Parents:

f97f5cc2

Message:

Slightly more graceful handling of missing devices in fdisk.

File:

• uspace/app/fdisk/fdisk.c (modified) (2 diffs)

uspace/app/fdisk/fdisk.c

@@ -181 +181 @@
         ndevs = 0;
         while (info != NULL) {
-                ++ndevs;
-
                 rc = fdisk_dev_info_get_svcname(info, &svcname);
                 if (rc != EOK) {
-                        printf("Error getting device service name.\n");
-                        goto error;
+                        fdisk_dev_info_get_svcid(info, &svcid);
+                        printf("Error getting device service name "
+                            "(service ID %zu).\n", svcid);
+                        info = fdisk_dev_next(info);
+                        continue;
                 }
 
                 rc = fdisk_dev_info_capacity(info, &cap);
                 if (rc != EOK) {
-                        printf("Error getting device capacity.\n");
-                        goto error;
+                        printf("Error getting device capacity "
+                            "(device %s).\n", svcname);
+                        info = fdisk_dev_next(info);
+                        continue;
                 }
 
@@ -222 +225 @@
                         goto error;
                 }
+
+                ++ndevs;
 
                 free(dtext);