nvme-print: Remove dead !LIBUUID code

We have added a hard dependency to libuuid. Remove the ifdefs and the
dead code.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/nvme-print.c b/nvme-print.c
index 225a2f7ed5a380bef4162d59d0732062b791940d..28faac7404eb092aca84ec25a7bb1c12c293cb7d 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -3073,21 +3073,9 @@ static const char *nvme_uuid_to_string(uuid_t uuid)
 {
        /* large enough to hold uuid str (37) + null-termination byte */
        static char uuid_str[40];
-#ifdef CONFIG_LIBUUID
+
        uuid_unparse_lower(uuid, uuid_str);
-#else
-       static const char *hex_digits = "0123456789abcdef";
-       char *p = &uuid_str[0];
-       int i;
 
-       for (i = 0; i < 16; i++) {
-               *p++ = hex_digits[(uuid.b[i] & 0xf0) >> 4];
-               *p++ = hex_digits[uuid.b[i] & 0x0f];
-               if (i == 3 || i == 5 || i == 7 || i == 9)
-                       *p++ = '-';
-       }
-       *p = '\0';
-#endif
        return uuid_str;
 }
 
@@ -4143,10 +4131,7 @@ static void json_nvme_id_ns_descs(void *data)
        union {
                __u8 eui64[NVME_NIDT_EUI64_LEN];
                __u8 nguid[NVME_NIDT_NGUID_LEN];
-
-#ifdef CONFIG_LIBUUID
                uuid_t uuid;
-#endif
                __u8 csi;
        } desc;
 
@@ -4185,14 +4170,13 @@ static void json_nvme_id_ns_descs(void *data)
                        nidt_name = "nguid";
                        break;
 
-#ifdef CONFIG_LIBUUID
                case NVME_NIDT_UUID:
                        memcpy(desc.uuid, data + off, sizeof(desc.uuid));
                        uuid_unparse_lower(desc.uuid, json_str);
                        len = sizeof(desc.uuid);
                        nidt_name = "uuid";
                        break;
-#endif
+
                case NVME_NIDT_CSI:
                        memcpy(&desc.csi, data + off, sizeof(desc.csi));
                        json_str_p += sprintf(json_str_p, "%#x", desc.csi);
@@ -4238,10 +4222,8 @@ void nvme_show_id_ns_descs(void *data, unsigned nsid, enum nvme_print_flags flag
 {
        int pos, len = 0;
        int i;
-#ifdef CONFIG_LIBUUID
        uuid_t uuid;
        char uuid_str[37];
-#endif
        __u8 eui64[8];
        __u8 nguid[16];
        __u8 csi;
@@ -4275,14 +4257,12 @@ void nvme_show_id_ns_descs(void *data, unsigned nsid, enum nvme_print_flags flag
                        printf("\n");
                        len = sizeof(nguid);
                        break;
-#ifdef CONFIG_LIBUUID
                case NVME_NIDT_UUID:
                        memcpy(uuid, data + pos + sizeof(*cur), 16);
                        uuid_unparse_lower(uuid, uuid_str);
                        printf("uuid    : %s\n", uuid_str);
                        len = sizeof(uuid);
                        break;
-#endif
                case NVME_NIDT_CSI:
                        memcpy(&csi, data + pos + sizeof(*cur), 1);
                        printf("csi     : %#x\n", csi);

diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
index eea32e3f2119c8f69bb1668ba3328cbcaf3ba5db..7b8b4177c0bbe8fdb43ea49c29fbaa23e7ef5884 100644 (file)
--- a/plugins/netapp/netapp-nvme.c
+++ b/plugins/netapp/netapp-nvme.c
@@ -117,13 +117,11 @@ static void netapp_get_ns_size(char *size, long long *lba,
 
 static void netapp_uuid_to_str(char *str, void *data)
 {
-#ifdef LIBUUID
        uuid_t uuid;
        struct nvme_ns_id_desc *desc = data;
 
        memcpy(uuid, data + sizeof(*desc), 16);
        uuid_unparse_lower(uuid, str);
-#endif
 }
 
 static void ontap_labels_to_str(char *dst, char *src, int count)