Changes in uspace/app/fdisk/fdisk.c [6c4eedf:1d6dd2a] in mainline

File:

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

uspace/app/fdisk/fdisk.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <fdisk.h>
+#include <str.h>
 
 #define NO_LABEL_CAPTION "(No name)"
@@ -68 +69 @@
 } devac_t;
 
-static int fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
+static errno_t fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
     char **rstr)
 {
-        int rc;
+        errno_t rc;
         char *s;
 
@@ -97 +98 @@
 
 /** Confirm user selection. */
-static int fdsk_confirm(const char *msg, bool *rconfirm)
+static errno_t fdsk_confirm(const char *msg, bool *rconfirm)
 {
         tinput_t *tinput = NULL;
         char *answer;
-        int rc;
+        errno_t rc;
 
         tinput = tinput_new();
@@ -146 +147 @@
 
 /** Device selection */
-static int fdsk_dev_sel_choice(service_id_t *rsvcid)
+static errno_t fdsk_dev_sel_choice(service_id_t *rsvcid)
 {
         fdisk_dev_list_t *devlist = NULL;
@@ -159 +160 @@
         void *sel;
         int ndevs;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -210 +211 @@
                 }
 
-                rc = asprintf(&dtext, "%s (%s)", svcname, scap);
-                if (rc < 0) {
+                int ret = asprintf(&dtext, "%s (%s)", svcname, scap);
+                if (ret < 0) {
                         rc = ENOMEM;
                         printf("Out of memory.\n");
@@ -269 +270 @@
         return EOK;
 error:
+        assert(rc != EOK);
+        *rsvcid = 0;
         if (devlist != NULL)
                 fdisk_dev_list_free(devlist);
@@ -279 +282 @@
 }
 
-static int fdsk_create_label(fdisk_dev_t *dev)
+static errno_t fdsk_create_label(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -285 +288 @@
         char *sltype = NULL;
         int i;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -339 +342 @@
 }
 
-static int fdsk_delete_label(fdisk_dev_t *dev)
+static errno_t fdsk_delete_label(fdisk_dev_t *dev)
 {
         bool confirm;
-        int rc;
+        errno_t rc;
 
         rc = fdsk_confirm("Warning. Any data on disk will be lost. "
@@ -363 +366 @@
 }
 
-static int fdsk_erase_disk(fdisk_dev_t *dev)
+static errno_t fdsk_erase_disk(fdisk_dev_t *dev)
 {
         bool confirm;
-        int rc;
+        errno_t rc;
 
         rc = fdsk_confirm("Warning. Any data on disk will be lost. "
@@ -387 +390 @@
 }
 
-static int fdsk_select_fstype(vol_fstype_t *fstype)
+static errno_t fdsk_select_fstype(vol_fstype_t *fstype)
 {
         nchoice_t *choice = NULL;
@@ -393 +396 @@
         char *sfstype;
         int i;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -442 +445 @@
 }
 
-static int fdsk_create_part(fdisk_dev_t *dev, label_pkind_t pkind)
+static errno_t fdsk_create_part(fdisk_dev_t *dev, label_pkind_t pkind)
 {
-        int rc;
+        errno_t rc;
         fdisk_part_spec_t pspec;
         cap_spec_t cap;
@@ -551 +554 @@
 }
 
-static int fdsk_delete_part(fdisk_dev_t *dev)
+static errno_t fdsk_delete_part(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -563 +566 @@
         bool confirm;
         void *sel;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -613 +616 @@
                                 label = "(No name)";
 
-                        rc = asprintf(&sdesc, "%s %s, %s, %s", label,
+                        int ret = asprintf(&sdesc, "%s %s, %s, %s", label,
                             scap, spkind, sfstype);
-                        if (rc < 0) {
+                        if (ret < 0) {
                                 rc = ENOMEM;
                                 goto error;
@@ -621 +624 @@
 
                 } else {
-                        rc = asprintf(&sdesc, "%s, %s", scap, spkind);
-                        if (rc < 0) {
+                        int ret = asprintf(&sdesc, "%s, %s", scap, spkind);
+                        if (ret < 0) {
                                 rc = ENOMEM;
                                 goto error;
@@ -698 +701 @@
 
 /** Device menu */
-static int fdsk_dev_menu(fdisk_dev_t *dev)
+static errno_t fdsk_dev_menu(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -715 +718 @@
         char *spkind;
         const char *label;
-        int rc;
+        errno_t rc;
         int npart;
         void *sel;
@@ -1077 +1080 @@
         service_id_t svcid;
         fdisk_dev_t *dev;
-        int rc;
+        errno_t rc;
 
         rc = fdisk_create(&fdisk);