Changeset d3b2ffa in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2018-06-29T15:40:10Z (7 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/lib/fdisk/src/fdisk.c (modified) (1 diff)

uspace/lib/fdisk/src/fdisk.c

@@ -813 +813 @@
 }
 
-errno_t fdisk_ltype_format(label_type_t ltype, char **rstr)
-{
-        const char *sltype;
-        char *s;
-
-        sltype = NULL;
-        switch (ltype) {
-        case lt_none:
-                sltype = "None";
-                break;
-        case lt_mbr:
-                sltype = "MBR";
-                break;
-        case lt_gpt:
-                sltype = "GPT";
-                break;
-        }
-
-        s = str_dup(sltype);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
-errno_t fdisk_fstype_format(vol_fstype_t fstype, char **rstr)
-{
-        const char *sfstype;
-        char *s;
-
-        sfstype = NULL;
-        switch (fstype) {
-        case fs_exfat:
-                sfstype = "ExFAT";
-                break;
-        case fs_fat:
-                sfstype = "FAT";
-                break;
-        case fs_minix:
-                sfstype = "MINIX";
-                break;
-        case fs_ext4:
-                sfstype = "Ext4";
-                break;
-        case fs_cdfs:
-                sfstype = "ISO 9660";
-                break;
-        }
-
-        s = str_dup(sfstype);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
-errno_t fdisk_pkind_format(label_pkind_t pkind, char **rstr)
-{
-        const char *spkind;
-        char *s;
-
-        spkind = NULL;
-        switch (pkind) {
-        case lpk_primary:
-                spkind = "Primary";
-                break;
-        case lpk_extended:
-                spkind = "Extended";
-                break;
-        case lpk_logical:
-                spkind = "Logical";
-                break;
-        }
-
-        s = str_dup(spkind);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
 /** Get free partition index. */
 static errno_t fdisk_part_get_free_idx(fdisk_dev_t *dev, int *rindex)