Lines Matching refs:uuid

42 -#define get_label_uuid(fd, label, uuid, type) \
43 -	get_label_uuid(fd, label, uuid)
44 -#define uuidcache_addentry(device, label, uuid, type) \
45 -	uuidcache_addentry(device, label, uuid)
46 +#define get_label_uuid(fd, label, partlabel, uuid, type) \
47 +	get_label_uuid(fd, label, partlabel, uuid)
48 +#define uuidcache_addentry(device, label, partlabel, uuid, type) \
49 +	uuidcache_addentry(device, label, partlabel, uuid)
57 -get_label_uuid(int fd, char **label, char **uuid, const char **type)
58 +get_label_uuid(int fd, char **label, char **partlabel, char **uuid, const char **type)
68 @@ -55,12 +58,30 @@ get_label_uuid(int fd, char **label, char **uuid, const char **type)
72 -	if (vid->label[0] != '\0' || vid->uuid[0] != '\0'
90 +	if (vid->label[0] != '\0' || vid->partlabel[0] != '\0' || vid->uuid[0] != '\0'
97  		*uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));
100 @@ -77,7 +98,7 @@ get_label_uuid(int fd, char **label, char **uuid, const char **type)
102  /* NB: we take ownership of (malloc'ed) label and uuid */
104 -uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uuid, const char *ty…
105 …char *device, /*int major, int minor,*/ char *label, char *partlabel, char *uuid, const char *type)
114  	last->uc_uuid = uuid;
128  	char *uuid = uuid; /* for compiler */
138 -	if (get_label_uuid(fd, &label, &uuid, &type) == 0) {
139 +	if (get_label_uuid(fd, &label, &partlabel, &uuid, &type) == 0) {
141 -		uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, uuid, type);
142 +		uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, partlabel, uuid, type);
187  	/* uuid is stored in ASCII (not binary) form here: */