From 52185155088d0910d29c7f4fdf5cb3eecaac8965 Mon Sep 17 00:00:00 2001 From: Sven-Göran Bergh Date: Mon, 14 Jan 2013 00:50:49 +0100 Subject: 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 Signed-off-by: Denys Vlasenko --- util-linux/volume_id/volume_id_internal.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'util-linux/volume_id/volume_id_internal.h') diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h index dd62df3..e26ebaa 100644 --- a/util-linux/volume_id/volume_id_internal.h +++ b/util-linux/volume_id/volume_id_internal.h @@ -136,11 +136,15 @@ void FAST_FUNC free_volume_id(struct volume_id *id); #define cpu_to_be32(x) (x) #endif +/* volume_id_set_uuid(id,buf,fmt) assumes size of uuid buf + * by shifting: 4 << fmt, except for fmt == UUID_DCE_STRING. + * The constants below should match sizes. + */ enum uuid_format { - UUID_DCE_STRING, - UUID_DCE, - UUID_DOS, - UUID_NTFS, + UUID_DOS = 0, /* 4 bytes */ + UUID_NTFS = 1, /* 8 bytes */ + UUID_DCE = 2, /* 16 bytes */ + UUID_DCE_STRING = 3, /* 36 bytes (VOLUME_ID_UUID_SIZE) */ }; enum endian { -- cgit v1.1