volume_id: remove unused usage types

diff --git a/extras/volume_id/lib/libvolume_id-private.h b/extras/volume_id/lib/libvolume_id-private.h
index 1b4a782b6513c20022b770029140c6f5dbeee49f..8a5c327aeac89388424a1152db32caacfd503495 100644 (file)
--- a/extras/volume_id/lib/libvolume_id-private.h
+++ b/extras/volume_id/lib/libvolume_id-private.h
@@ -94,11 +94,9 @@ enum endian {
 
 enum volume_id_usage {
        VOLUME_ID_UNUSED,
 
 enum volume_id_usage {
        VOLUME_ID_UNUSED,

-       VOLUME_ID_UNPROBED,

        VOLUME_ID_OTHER,
        VOLUME_ID_FILESYSTEM,
        VOLUME_ID_RAID,
        VOLUME_ID_OTHER,
        VOLUME_ID_FILESYSTEM,
        VOLUME_ID_RAID,

-       VOLUME_ID_DISKLABEL,

        VOLUME_ID_CRYPTO,
 };
 
        VOLUME_ID_CRYPTO,
 };
 

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 671f97ee271407a5a194935360e4aad4ab75027f..9844e5e97cf2bbd58b2436e72aa5b4daf1af351c 100644 (file)
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -200,12 +200,8 @@ static char *usage_to_string(enum volume_id_usage usage_id)
                return "other";
        case VOLUME_ID_RAID:
                return "raid";
                return "other";
        case VOLUME_ID_RAID:
                return "raid";

-       case VOLUME_ID_DISKLABEL:
-               return "disklabel";

        case VOLUME_ID_CRYPTO:
                return "crypto";
        case VOLUME_ID_CRYPTO:
                return "crypto";

-       case VOLUME_ID_UNPROBED:
-               return "unprobed";

        case VOLUME_ID_UNUSED:
                return "unused";
        }
        case VOLUME_ID_UNUSED:
                return "unused";
        }