misc: replace magic number 37 with UUID_STR_LEN
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
This commit is contained in:
parent
0047626887
commit
b443c1779e
|
@ -132,7 +132,7 @@ static void set_uuid_and_label(const struct mkswap_control *ctl)
|
||||||
printf(_("no label, "));
|
printf(_("no label, "));
|
||||||
#ifdef HAVE_LIBUUID
|
#ifdef HAVE_LIBUUID
|
||||||
if (ctl->uuid) {
|
if (ctl->uuid) {
|
||||||
char uuid_string[37];
|
char uuid_string[UUID_STR_LEN];
|
||||||
uuid_unparse(ctl->uuid, uuid_string);
|
uuid_unparse(ctl->uuid, uuid_string);
|
||||||
printf("UUID=%s\n", uuid_string);
|
printf("UUID=%s\n", uuid_string);
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -177,7 +177,7 @@ static int probe_dos_pt(blkid_probe pr,
|
||||||
struct dos_partition *p0, *p;
|
struct dos_partition *p0, *p;
|
||||||
unsigned char *data;
|
unsigned char *data;
|
||||||
uint32_t start, size, id;
|
uint32_t start, size, id;
|
||||||
char idstr[37];
|
char idstr[UUID_STR_LEN];
|
||||||
|
|
||||||
|
|
||||||
data = blkid_probe_get_sector(pr, 0);
|
data = blkid_probe_get_sector(pr, 0);
|
||||||
|
|
|
@ -166,7 +166,7 @@ struct blkid_struct_parttable {
|
||||||
uint64_t offset; /* begin of the partition table (in bytes) */
|
uint64_t offset; /* begin of the partition table (in bytes) */
|
||||||
int nparts; /* number of partitions */
|
int nparts; /* number of partitions */
|
||||||
blkid_partition parent; /* parent of nested partition table */
|
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 */
|
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) */
|
uint64_t size; /* size of the partitions (512-bytes sectors) */
|
||||||
|
|
||||||
int type; /* partition type */
|
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 */
|
unsigned long long flags; /* partition flags / attributes */
|
||||||
|
|
||||||
int partno; /* partition number */
|
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 */
|
unsigned char name[128]; /* Partition in UTF8 name (when supported by PT), e.g. Mac */
|
||||||
|
|
||||||
blkid_parttable tab; /* partition table */
|
blkid_parttable tab; /* partition table */
|
||||||
|
@ -1122,7 +1122,7 @@ int blkid_partitions_set_ptuuid(blkid_probe pr, unsigned char *uuid)
|
||||||
if (!v)
|
if (!v)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
v->len = 37;
|
v->len = UUID_STR_LEN;
|
||||||
v->data = calloc(1, v->len);
|
v->data = calloc(1, v->len);
|
||||||
if (v->data) {
|
if (v->data) {
|
||||||
blkid_unparse_uuid(uuid, (char *) v->data, v->len);
|
blkid_unparse_uuid(uuid, (char *) v->data, v->len);
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
#include "blkidP.h"
|
#include "blkidP.h"
|
||||||
#include "pt-mbr.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 int blkid_partitions_get_flags(blkid_probe pr);
|
||||||
|
|
||||||
extern blkid_parttable blkid_partlist_new_parttable(blkid_partlist ls,
|
extern blkid_parttable blkid_partlist_new_parttable(blkid_partlist ls,
|
||||||
|
|
|
@ -768,7 +768,7 @@ int blkid_probe_set_uuid_as(blkid_probe pr, unsigned char *uuid, const char *nam
|
||||||
if (!v)
|
if (!v)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
v->len = 37;
|
v->len = UUID_STR_LEN;
|
||||||
v->data = calloc(1, v->len);
|
v->data = calloc(1, v->len);
|
||||||
if (!v->data)
|
if (!v->data)
|
||||||
rc = -ENOMEM;
|
rc = -ENOMEM;
|
||||||
|
|
|
@ -9,6 +9,10 @@
|
||||||
|
|
||||||
#include "blkidP.h"
|
#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 cramfs_idinfo;
|
||||||
extern const struct blkid_idinfo swap_idinfo;
|
extern const struct blkid_idinfo swap_idinfo;
|
||||||
extern const struct blkid_idinfo swsuspend_idinfo;
|
extern const struct blkid_idinfo swsuspend_idinfo;
|
||||||
|
|
|
@ -286,6 +286,10 @@ static struct fdisk_parttype gpt_parttypes[] =
|
||||||
#define gpt_partition_start(_e) le64_to_cpu((_e)->lba_start)
|
#define gpt_partition_start(_e) le64_to_cpu((_e)->lba_start)
|
||||||
#define gpt_partition_end(_e) le64_to_cpu((_e)->lba_end)
|
#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
|
* in-memory fdisk GPT stuff
|
||||||
*/
|
*/
|
||||||
|
@ -368,7 +372,7 @@ static struct fdisk_parttype *gpt_partition_parttype(
|
||||||
const struct gpt_entry *e)
|
const struct gpt_entry *e)
|
||||||
{
|
{
|
||||||
struct fdisk_parttype *t;
|
struct fdisk_parttype *t;
|
||||||
char str[37];
|
char str[UUID_STR_LEN];
|
||||||
struct gpt_guid guid = e->type;
|
struct gpt_guid guid = e->type;
|
||||||
|
|
||||||
guid_to_string(&guid, str);
|
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)
|
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;
|
struct gpt_guid guid = header->disk_guid;
|
||||||
|
|
||||||
guid_to_string(&guid, str);
|
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 fdisk_gpt_label *gpt;
|
||||||
struct gpt_entry *e;
|
struct gpt_entry *e;
|
||||||
char u_str[37];
|
char u_str[UUID_STR_LEN];
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
struct gpt_guid guid;
|
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);
|
e = gpt_get_entry(gpt, n);
|
||||||
|
|
||||||
if (pa->uuid) {
|
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;
|
struct gpt_guid guid;
|
||||||
|
|
||||||
guid = e->partition_guid;
|
guid = e->partition_guid;
|
||||||
|
@ -2473,7 +2477,7 @@ static int gpt_create_disklabel(struct fdisk_context *cxt)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
size_t esz = 0;
|
size_t esz = 0;
|
||||||
char str[37];
|
char str[UUID_STR_LEN];
|
||||||
struct fdisk_gpt_label *gpt;
|
struct fdisk_gpt_label *gpt;
|
||||||
struct gpt_guid guid;
|
struct gpt_guid guid;
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ static int check_uuids_in_file(const char *file)
|
||||||
{
|
{
|
||||||
int fd, ret = 0;
|
int fd, ret = 0;
|
||||||
size_t sz;
|
size_t sz;
|
||||||
char str[sizeof("01234567-89ab-cdef-0134-567890abcedf")];
|
char str[UUID_STR_LEN];
|
||||||
uuid_t uuidBits;
|
uuid_t uuidBits;
|
||||||
|
|
||||||
if ((fd = open(file, O_RDONLY)) < 0) {
|
if ((fd = open(file, O_RDONLY)) < 0) {
|
||||||
|
|
|
@ -99,6 +99,8 @@ extern int uuid_is_null(const uuid_t uu);
|
||||||
/* parse.c */
|
/* parse.c */
|
||||||
extern int uuid_parse(const char *in, uuid_t uu);
|
extern int uuid_parse(const char *in, uuid_t uu);
|
||||||
|
|
||||||
|
#define UUID_STR_LEN 37
|
||||||
|
|
||||||
/* unparse.c */
|
/* unparse.c */
|
||||||
extern void uuid_unparse(const uuid_t uu, char *out);
|
extern void uuid_unparse(const uuid_t uu, char *out);
|
||||||
extern void uuid_unparse_lower(const uuid_t uu, char *out);
|
extern void uuid_unparse_lower(const uuid_t uu, char *out);
|
||||||
|
|
|
@ -247,7 +247,7 @@ static void create_nprocesses(void)
|
||||||
|
|
||||||
static void object_dump(size_t idx, object_t *obj)
|
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;
|
p = uuid_string;
|
||||||
object_uuid_to_string(obj, &p);
|
object_uuid_to_string(obj, &p);
|
||||||
|
|
|
@ -41,9 +41,6 @@
|
||||||
|
|
||||||
#include "nls.h"
|
#include "nls.h"
|
||||||
|
|
||||||
/* length of textual representation of UUID, including trailing \0 */
|
|
||||||
#define UUID_STR_LEN 37
|
|
||||||
|
|
||||||
/* length of binary representation of UUID */
|
/* length of binary representation of UUID */
|
||||||
#define UUID_LEN (sizeof(uuid_t))
|
#define UUID_LEN (sizeof(uuid_t))
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ main (int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
int do_type = 0;
|
int do_type = 0;
|
||||||
char str[37];
|
char str[UUID_STR_LEN];
|
||||||
uuid_t uu;
|
uuid_t uu;
|
||||||
|
|
||||||
static const struct option longopts[] = {
|
static const struct option longopts[] = {
|
||||||
|
|
|
@ -67,6 +67,10 @@
|
||||||
|
|
||||||
#define MAX_PAGESIZE (64 * 1024)
|
#define MAX_PAGESIZE (64 * 1024)
|
||||||
|
|
||||||
|
#ifndef UUID_STR_LEN
|
||||||
|
#define UUID_STR_LEN 37
|
||||||
|
#endif
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
SIG_SWAPSPACE = 1,
|
SIG_SWAPSPACE = 1,
|
||||||
SIG_SWSUSPEND
|
SIG_SWSUSPEND
|
||||||
|
@ -485,7 +489,7 @@ static void swap_get_info(struct swap_device *dev, const char *hdr)
|
||||||
|
|
||||||
if (s && *s->uuid) {
|
if (s && *s->uuid) {
|
||||||
const unsigned char *u = s->uuid;
|
const unsigned char *u = s->uuid;
|
||||||
char str[37];
|
char str[UUID_STR_LEN];
|
||||||
|
|
||||||
snprintf(str, sizeof(str),
|
snprintf(str, sizeof(str),
|
||||||
"%02x%02x%02x%02x-"
|
"%02x%02x%02x%02x-"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
static void get_template(const char *ns)
|
static void get_template(const char *ns)
|
||||||
{
|
{
|
||||||
const uuid_t *uuidptr;
|
const uuid_t *uuidptr;
|
||||||
char buf[37];
|
char buf[UUID_STR_LEN];
|
||||||
|
|
||||||
uuidptr = uuid_get_template(ns);
|
uuidptr = uuid_get_template(ns);
|
||||||
if (uuidptr == NULL)
|
if (uuidptr == NULL)
|
||||||
|
|
Loading…
Reference in New Issue