Changeset 0ecfc62 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2015-10-09T18:11:08Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a43785

Parents:

372df8f

Message:

Information structures need updating to new model.

File:

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

uspace/app/fdisk/fdisk.c

@@ -525 +525 @@
         }
 
-        switch (linfo.dcnt) {
-        case dc_empty:
-                printf("Disk is empty.\n");
-                break;
-        case dc_label:
+        switch (linfo.ltype) {
+        case lt_none:
+                printf("Disk contains no label.\n");
+                break;
+        default:
                 rc = fdisk_ltype_format(linfo.ltype, &sltype);
                 if (rc != EOK) {
@@ -540 +540 @@
                 free(sltype);
                 sltype = NULL;
-                break;
-        case dc_fs:
-                printf("Disk contains a file system.\n");
-                break;
-        case dc_unknown:
-                printf("Disk contains unknown data.\n");
                 break;
         }
@@ -602 +596 @@
         }
 
-        if (linfo.dcnt == dc_label) {
-                if ((linfo.flags & lf_ext_supp) != 0) {
-                        if ((linfo.flags & lf_can_create_pri) != 0) {
-                                rc = nchoice_add(choice, "Create primary "
-                                    "partition",
-                                    (void *)devac_create_pri_part);
-                                if (rc != EOK) {
-                                        assert(rc == ENOMEM);
+        if ((linfo.flags & lf_ext_supp) != 0) {
+                if ((linfo.flags & lf_can_create_pri) != 0) {
+                        rc = nchoice_add(choice, "Create primary "
+                            "partition",
+                            (void *)devac_create_pri_part);
+                        if (rc != EOK) {
+                                assert(rc == ENOMEM);
+                                printf("Out of memory.\n");
+                                goto error;
+                        }
+                }
+
+                if ((linfo.flags & lf_can_create_ext) != 0) {
+                        rc = nchoice_add(choice, "Create extended "
+                            "partition",
+                            (void *)devac_create_ext_part);
+                        if (rc != EOK) {
+                                assert(rc == ENOMEM);
+                                printf("Out of memory.\n");
+                                goto error;
+                        }
+                }
+
+                if ((linfo.flags & lf_can_create_log) != 0) {
+                        rc = nchoice_add(choice, "Create logical "
+                            "partition",
+                            (void *)devac_create_log_part);
+                        if (rc != EOK) {
+                                assert(rc == ENOMEM);
+                                printf("Out of memory.\n");
+                                goto error;
+                        }
+                }
+        } else { /* (linfo.flags & lf_ext_supp) == 0 */
+                if ((linfo.flags & lf_can_create_pri) != 0) {
+                        rc = nchoice_add(choice, "Create partition",
+                            (void *)devac_create_pri_part);
+                        if (rc != EOK) {
+                                assert(rc == ENOMEM);
                                         printf("Out of memory.\n");
                                         goto error;
                                 }
-                        }
-
-                        if ((linfo.flags & lf_can_create_ext) != 0) {
-                                rc = nchoice_add(choice, "Create extended "
-                                    "partition",
-                                    (void *)devac_create_ext_part);
-                                if (rc != EOK) {
-                                        assert(rc == ENOMEM);
-                                        printf("Out of memory.\n");
-                                        goto error;
-                                }
-                        }
-
-                        if ((linfo.flags & lf_can_create_log) != 0) {
-                                rc = nchoice_add(choice, "Create logical "
-                                    "partition",
-                                    (void *)devac_create_log_part);
-                                if (rc != EOK) {
-                                        assert(rc == ENOMEM);
-                                        printf("Out of memory.\n");
-                                        goto error;
-                                }
-                        }
-                } else { /* (linfo.flags & lf_ext_supp) == 0 */
-                        if ((linfo.flags & lf_can_create_pri) != 0) {
-                                rc = nchoice_add(choice, "Create partition",
-                                    (void *)devac_create_pri_part);
-                                if (rc != EOK) {
-                                        assert(rc == ENOMEM);
-                                        printf("Out of memory.\n");
-                                        goto error;
-                                }
-                        }
                 }
         }
@@ -659 +651 @@
         }
 
-        if (linfo.dcnt == dc_empty) {
+        if (linfo.ltype == lt_none) {
                 rc = nchoice_add(choice, "Create label",
                     (void *)devac_create_label);