volume_id: uuid_format small code shrink

function                                             old     new   delta
volume_id_set_uuid                                   318     300     -18

Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 1 insertions, 16 deletions

diff --git a/util-linux/volume_id/util.c b/util-linux/volume_id/util.c
index 11ee0d52e..0e2d24be0 100644
--- a/util-linux/volume_id/util.c
+++ b/util-linux/volume_id/util.c
@@ -135,23 +135,8 @@ void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enu
 void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, enum uuid_format format)
 {
         unsigned i;
-        unsigned count = 0;
+        unsigned count = (format == UUID_DCE_STRING ? VOLUME_ID_UUID_SIZE : 4 << format);
 
-        switch (format) {
-        case UUID_DOS:
-                count = 4;
-                break;
-        case UUID_NTFS:
-                count = 8;
-                break;
-        case UUID_DCE:
-                count = 16;
-                break;
-        case UUID_DCE_STRING:
-                /* 36 is ok, id->uuid has one extra byte for NUL */
-                count = VOLUME_ID_UUID_SIZE;
-                break;
-        }
 //      memcpy(id->uuid_raw, buf, count);
 //      id->uuid_raw_len = count;