misc: cleanup UUID_STR_LEN definitions

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index c79132773f98d4a7f19a82912c6c30a427f16314..8108b0efab2c1145eb26c3e59b3a08946499cf13 100644 (file)
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -23,6 +23,12 @@
 #include <stdarg.h>
 #include <stdint.h>
 
+#ifdef HAVE_LIBUUID
+# include <uuid.h>
+#else
+# define UUID_STR_LEN   37
+#endif
+
 #include "c.h"
 #include "bitops.h"    /* $(top_srcdir)/include/ */
 #include "blkdev.h"

diff --git a/libblkid/src/partitions/partitions.h b/libblkid/src/partitions/partitions.h
index 5ed2681e307a5d0dc64b51832aefa33cced42a6e..1d99fb6a36e56f0444ec4d6df9bac9ad9e9d263f 100644 (file)
--- a/libblkid/src/partitions/partitions.h
+++ b/libblkid/src/partitions/partitions.h
@@ -4,10 +4,6 @@
 #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/probe.c b/libblkid/src/probe.c
index 21cd790e95d679f0189ff7083318e78c51889d22..476461bc4763b521bf7e58c524b8526532351c0d 100644 (file)
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -105,10 +105,6 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#ifdef HAVE_LIBUUID
-# include <uuid.h>
-#endif
-
 #include "blkidP.h"
 #include "all-io.h"
 #include "sysfs.h"

diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 3dea7b88139798daa89351d6523bdb9fbb5b84e8..695c3b783d59b7a8fa5f2fdecbaebc12928a586a 100644 (file)
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -9,10 +9,6 @@
 
 #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/fdiskP.h b/libfdisk/src/fdiskP.h
index 23903b4b47fbe5051772c107a27a58f8ce39d3ad..b81d6fc7a2349562aae7be42b1a9f4c9edae25f0 100644 (file)
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <uuid.h>
 
 #include "c.h"
 #include "libfdisk.h"

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 7134a36ce295b844fb421ce36f3f3923273aeca5..26d04f1d881fe47292d3811c9715e7a8b7b4412f 100644 (file)
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -286,10 +286,6 @@ 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
  */

diff --git a/libuuid/src/uuid.h b/libuuid/src/uuid.h
index 2fd470558e05b84d1c2c5dae6bd152b85b371539..03c232caad50b4998e44c8e5ca54aa22ba68211f 100644 (file)
--- a/libuuid/src/uuid.h
+++ b/libuuid/src/uuid.h
@@ -62,6 +62,8 @@ typedef unsigned char uuid_t[16];
 #define UUID_TYPE_SHIFT      4
 #define UUID_TYPE_MASK     0xf
 
+#define UUID_STR_LEN   37
+
 /* Allow UUID constants to be defined */
 #ifdef __GNUC__
 #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
@@ -99,8 +101,6 @@ 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/uuidparse.c b/misc-utils/uuidparse.c
index 5fa34b23d2241346cf7ab621009532a9c4c9e2d2..19bb3f1b919308482f61f1de6623216b189c59be 100644 (file)
--- a/misc-utils/uuidparse.c
+++ b/misc-utils/uuidparse.c
@@ -55,8 +55,6 @@
 #include "uuid.h"
 #include "xalloc.h"
 
-#define UUID_STR_LEN 37
-
 /* column IDs */
 enum {
        COL_UUID = 0,

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 1e7d3c0b527a308e2661c9bc5ffbfdfc323e13d7..6bf67a91f81d5ba586225e84b318d50e3b12715e 100644 (file)
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -68,7 +68,7 @@
 #define MAX_PAGESIZE   (64 * 1024)
 
 #ifndef UUID_STR_LEN
-#define UUID_STR_LEN   37
+# define UUID_STR_LEN  37
 #endif
 
 enum {