diff options
| author | Karel Zak | 2017-09-15 13:25:32 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-09-15 13:25:32 +0200 |
| commit | 9f20d800799fb1b5104cd87f9c3c68c9b159491f (patch) | |
| tree | 89509a047aeec9f377359f9ecf419c221705296f /libblkid | |
| parent | logger: make stdin parsing more friendly to static analyzers (diff) | |
| download | kernel-qcow2-util-linux-9f20d800799fb1b5104cd87f9c3c68c9b159491f.tar.gz kernel-qcow2-util-linux-9f20d800799fb1b5104cd87f9c3c68c9b159491f.tar.xz kernel-qcow2-util-linux-9f20d800799fb1b5104cd87f9c3c68c9b159491f.zip | |
misc: cleanup UUID_STR_LEN definitions
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid')
| -rw-r--r-- | libblkid/src/blkidP.h | 6 | ||||
| -rw-r--r-- | libblkid/src/partitions/partitions.h | 4 | ||||
| -rw-r--r-- | libblkid/src/probe.c | 4 | ||||
| -rw-r--r-- | libblkid/src/superblocks/superblocks.h | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h index c79132773..8108b0efa 100644 --- 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 5ed2681e3..1d99fb6a3 100644 --- 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 21cd790e9..476461bc4 100644 --- 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 3dea7b881..695c3b783 100644 --- 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; |