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

Timestamp:

2018-06-29T15:40:10Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5e904dd

Parents:

1e472ee (diff), 1a9174e (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 volume management improvements (still WIP).

File:

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

uspace/app/fdisk/fdisk.c

@@ -37 +37 @@
 #include <cap.h>
 #include <errno.h>
+#include <fdisk.h>
+#include <io/label.h>
 #include <nchoice.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <fdisk.h>
 #include <str.h>
+#include <vol.h>
 
 #define NO_LABEL_CAPTION "(No name)"
@@ -69 +71 @@
 } devac_t;
 
-static errno_t fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
-    char **rstr)
-{
-        errno_t rc;
-        char *s;
-
-        switch (pcnt) {
-        case vpc_empty:
-                s = str_dup("Empty");
-                if (s == NULL)
-                        return ENOMEM;
-                break;
-        case vpc_fs:
-                rc = fdisk_fstype_format(fstype, &s);
-                if (rc != EOK)
-                        return ENOMEM;
-                break;
-        case vpc_unknown:
-                s = str_dup("Unknown");
-                if (s == NULL)
-                        return ENOMEM;
-                break;
-        }
-
-        *rstr = s;
-        return EOK;
-}
-
 /** Confirm user selection. */
 static errno_t fdsk_confirm(const char *msg, bool *rconfirm)
@@ -305 +279 @@
 
         for (i = LT_FIRST; i < LT_LIMIT; i++) {
-                rc = fdisk_ltype_format(i, &sltype);
+                rc = label_type_format(i, &sltype);
                 if (rc != EOK)
                         goto error;
@@ -413 +387 @@
 
         for (i = 0; i < VOL_FSTYPE_LIMIT; i++) {
-                rc = fdisk_fstype_format(i, &sfstype);
+                rc = vol_fstype_format(i, &sfstype);
                 if (rc != EOK)
                         goto error;
@@ -598 +572 @@
                 }
 
-                rc = fdisk_pkind_format(pinfo.pkind, &spkind);
+                rc = label_pkind_format(pinfo.pkind, &spkind);
                 if (rc != EOK) {
                         printf("\nOut of memory.\n");
@@ -605 +579 @@
 
                 if (pinfo.pkind != lpk_extended) {
-                        rc = fdsk_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
+                        rc = vol_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
                         if (rc != EOK) {
                                 printf("Out of memory.\n");
@@ -773 +747 @@
                 break;
         default:
-                rc = fdisk_ltype_format(linfo.ltype, &sltype);
+                rc = label_type_format(linfo.ltype, &sltype);
                 if (rc != EOK) {
                         assert(rc == ENOMEM);
@@ -804 +778 @@
                 }
 
-                rc = fdsk_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
+                rc = vol_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -821 +795 @@
 
                 if ((linfo.flags & lf_ext_supp) != 0) {
-                        rc = fdisk_pkind_format(pinfo.pkind, &spkind);
+                        rc = label_pkind_format(pinfo.pkind, &spkind);
                         if (rc != EOK) {
                                 printf("\nOut of memory.\n");