misc: cleanup UUID_STR_LEN definitions
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
8b318eb25e
commit
9f20d80079
|
@ -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"
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <uuid.h>
|
||||
|
||||
#include "c.h"
|
||||
#include "libfdisk.h"
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -55,8 +55,6 @@
|
|||
#include "uuid.h"
|
||||
#include "xalloc.h"
|
||||
|
||||
#define UUID_STR_LEN 37
|
||||
|
||||
/* column IDs */
|
||||
enum {
|
||||
COL_UUID = 0,
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue