misc: replace magic number 37 with UUID_STR_LEN

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

14 files changed, 35 insertions, 20 deletions

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 748e241cf..a6077daf0 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -132,7 +132,7 @@ static void set_uuid_and_label(const struct mkswap_control *ctl)
 			printf(_("no label, "));
 #ifdef HAVE_LIBUUID
 		if (ctl->uuid) {
-			char uuid_string[37];
+			char uuid_string[UUID_STR_LEN];
 			uuid_unparse(ctl->uuid, uuid_string);
 			printf("UUID=%s\n", uuid_string);
 		} else
diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c
index 30e3e9e73..1db238781 100644
--- a/libblkid/src/partitions/dos.c
+++ b/libblkid/src/partitions/dos.c
@@ -177,7 +177,7 @@ static int probe_dos_pt(blkid_probe pr,
 	struct dos_partition *p0, *p;
 	unsigned char *data;
 	uint32_t start, size, id;
-	char idstr[37];
+	char idstr[UUID_STR_LEN];
 
 
 	data = blkid_probe_get_sector(pr, 0);
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 626e11729..d8fc8e3c8 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -166,7 +166,7 @@ struct blkid_struct_parttable {
 	uint64_t	offset;		/* begin of the partition table (in bytes) */
 	int		nparts;		/* number of partitions */
 	blkid_partition	parent;		/* parent of nested partition table */
-	char		id[37];		/* PT identifier (e.g. UUID for GPT) */
+	char		id[UUID_STR_LEN]; /* PT identifier (e.g. UUID for GPT) */
 
 	struct list_head t_tabs;	/* all tables */
 };
@@ -177,12 +177,12 @@ struct blkid_struct_partition {
 	uint64_t	size;		/* size of the partitions (512-bytes sectors) */
 
 	int		type;		/* partition type */
-	char		typestr[37];	/* partition type string (GPT and Mac) */
+	char		typestr[UUID_STR_LEN]; /* partition type string (GPT and Mac) */
 
 	unsigned long long flags;	/* partition flags / attributes */
 
 	int		partno;		/* partition number */
-	char		uuid[37];	/* UUID (when supported by PT), e.g GPT */
+	char		uuid[UUID_STR_LEN]; /* UUID (when supported by PT), e.g GPT */
 	unsigned char	name[128];	/* Partition in UTF8 name (when supported by PT), e.g. Mac */
 
 	blkid_parttable	tab;		/* partition table */
@@ -1122,7 +1122,7 @@ int blkid_partitions_set_ptuuid(blkid_probe pr, unsigned char *uuid)
 	if (!v)
 		return -ENOMEM;
 
-	v->len = 37;
+	v->len = UUID_STR_LEN;
 	v->data = calloc(1, v->len);
 	if (v->data) {
 		blkid_unparse_uuid(uuid, (char *) v->data, v->len);
diff --git a/libblkid/src/partitions/partitions.h b/libblkid/src/partitions/partitions.h
index 1d99fb6a3..5ed2681e3 100644
--- a/libblkid/src/partitions/partitions.h
+++ b/libblkid/src/partitions/partitions.h
@@ -4,6 +4,10 @@
 #include "blkidP.h"
 #include "pt-mbr.h"
 
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN	37
+#endif
+
 extern int blkid_partitions_get_flags(blkid_probe pr);
 
 extern blkid_parttable blkid_partlist_new_parttable(blkid_partlist ls,
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index e631e90ac..6b025ee1f 100644
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -768,7 +768,7 @@ int blkid_probe_set_uuid_as(blkid_probe pr, unsigned char *uuid, const char *nam
 	if (!v)
 		return -ENOMEM;
 
-	v->len = 37;
+	v->len = UUID_STR_LEN;
 	v->data = calloc(1, v->len);
 	if (!v->data)
 		rc = -ENOMEM;
diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 695c3b783..3dea7b881 100644
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -9,6 +9,10 @@
 
 #include "blkidP.h"
 
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN	37
+#endif
+
 extern const struct blkid_idinfo cramfs_idinfo;
 extern const struct blkid_idinfo swap_idinfo;
 extern const struct blkid_idinfo swsuspend_idinfo;
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 3a9d51da1..7134a36ce 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -286,6 +286,10 @@ static struct fdisk_parttype gpt_parttypes[] =
 #define gpt_partition_start(_e)		le64_to_cpu((_e)->lba_start)
 #define gpt_partition_end(_e)		le64_to_cpu((_e)->lba_end)
 
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN	37
+#endif
+
 /*
  * in-memory fdisk GPT stuff
  */
@@ -368,7 +372,7 @@ static struct fdisk_parttype *gpt_partition_parttype(
 		const struct gpt_entry *e)
 {
 	struct fdisk_parttype *t;
-	char str[37];
+	char str[UUID_STR_LEN];
 	struct gpt_guid guid = e->type;
 
 	guid_to_string(&guid, str);
@@ -482,7 +486,7 @@ static inline int gpt_sizeof_ents(struct gpt_header *hdr, size_t *sz)
 
 static char *gpt_get_header_id(struct gpt_header *header)
 {
-	char str[37];
+	char str[UUID_STR_LEN];
 	struct gpt_guid guid = header->disk_guid;
 
 	guid_to_string(&guid, str);
@@ -1735,7 +1739,7 @@ static int gpt_get_partition(struct fdisk_context *cxt, size_t n,
 {
 	struct fdisk_gpt_label *gpt;
 	struct gpt_entry *e;
-	char u_str[37];
+	char u_str[UUID_STR_LEN];
 	int rc = 0;
 	struct gpt_guid guid;
 
@@ -1805,7 +1809,7 @@ static int gpt_set_partition(struct fdisk_context *cxt, size_t n,
 	e = gpt_get_entry(gpt, n);
 
 	if (pa->uuid) {
-		char new_u[37], old_u[37];
+		char new_u[UUID_STR_LEN], old_u[UUID_STR_LEN];
 		struct gpt_guid guid;
 
 		guid = e->partition_guid;
@@ -2473,7 +2477,7 @@ static int gpt_create_disklabel(struct fdisk_context *cxt)
 {
 	int rc = 0;
 	size_t esz = 0;
-	char str[37];
+	char str[UUID_STR_LEN];
 	struct fdisk_gpt_label *gpt;
 	struct gpt_guid guid;
 
diff --git a/libuuid/src/test_uuid.c b/libuuid/src/test_uuid.c
index 4d155b533..400d6d8fc 100644
--- a/libuuid/src/test_uuid.c
+++ b/libuuid/src/test_uuid.c
@@ -68,7 +68,7 @@ static int check_uuids_in_file(const char *file)
 {
 	int fd, ret = 0;
 	size_t sz;
-	char str[sizeof("01234567-89ab-cdef-0134-567890abcedf")];
+	char str[UUID_STR_LEN];
 	uuid_t uuidBits;
 
 	if ((fd = open(file, O_RDONLY)) < 0) {
diff --git a/libuuid/src/uuid.h b/libuuid/src/uuid.h
index bf4e50063..2fd470558 100644
--- a/libuuid/src/uuid.h
+++ b/libuuid/src/uuid.h
@@ -99,6 +99,8 @@ extern int uuid_is_null(const uuid_t uu);
 /* parse.c */
 extern int uuid_parse(const char *in, uuid_t uu);
 
+#define UUID_STR_LEN	37
+
 /* unparse.c */
 extern void uuid_unparse(const uuid_t uu, char *out);
 extern void uuid_unparse_lower(const uuid_t uu, char *out);
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index de5ae3ab2..3f38fa430 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -247,7 +247,7 @@ static void create_nprocesses(void)
 
 static void object_dump(size_t idx, object_t *obj)
 {
-	char uuid_string[37], *p;
+	char uuid_string[UUID_STR_LEN], *p;
 
 	p = uuid_string;
 	object_uuid_to_string(obj, &p);
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 2cfb383f0..e7c25cfa1 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -41,9 +41,6 @@
 
 #include "nls.h"
 
-/* length of textual representation of UUID, including trailing \0 */
-#define UUID_STR_LEN	37
-
 /* length of binary representation of UUID */
 #define UUID_LEN	(sizeof(uuid_t))
 
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index e33e43bf0..ac950747d 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 {
 	int    c;
 	int    do_type = 0;
-	char   str[37];
+	char   str[UUID_STR_LEN];
 	uuid_t uu;
 
 	static const struct option longopts[] = {
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 641facb1f..1e7d3c0b5 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -67,6 +67,10 @@
 
 #define MAX_PAGESIZE	(64 * 1024)
 
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN	37
+#endif
+
 enum {
 	SIG_SWAPSPACE = 1,
 	SIG_SWSUSPEND
@@ -485,7 +489,7 @@ static void swap_get_info(struct swap_device *dev, const char *hdr)
 
 	if (s && *s->uuid) {
 		const unsigned char *u = s->uuid;
-		char str[37];
+		char str[UUID_STR_LEN];
 
 		snprintf(str, sizeof(str),
 			"%02x%02x%02x%02x-"
diff --git a/tests/helpers/test_uuid_namespace.c b/tests/helpers/test_uuid_namespace.c
index 1bbf8754d..1522ed2bc 100644
--- a/tests/helpers/test_uuid_namespace.c
+++ b/tests/helpers/test_uuid_namespace.c
@@ -7,7 +7,7 @@
 static void get_template(const char *ns)
 {
 	const uuid_t *uuidptr;
-	char buf[37];
+	char buf[UUID_STR_LEN];
 
 	uuidptr = uuid_get_template(ns);
 	if (uuidptr == NULL)