diff options
author | Philip Prindeville | 2017-08-28 21:20:55 +0200 |
---|---|---|
committer | Karel Zak | 2017-09-05 11:49:21 +0200 |
commit | b443c1779e39bb056b6045b81ba655c875b45747 (patch) | |
tree | e3ec49667aec5cf95a4d655db7818a24d386e721 /libfdisk | |
parent | libuuid: add support for hash-based UUIDs (diff) | |
download | kernel-qcow2-util-linux-b443c1779e39bb056b6045b81ba655c875b45747.tar.gz kernel-qcow2-util-linux-b443c1779e39bb056b6045b81ba655c875b45747.tar.xz kernel-qcow2-util-linux-b443c1779e39bb056b6045b81ba655c875b45747.zip |
misc: replace magic number 37 with UUID_STR_LEN
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Diffstat (limited to 'libfdisk')
-rw-r--r-- | libfdisk/src/gpt.c | 14 |
1 files changed, 9 insertions, 5 deletions
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; |