SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename major/minor variable to maj/min to avoid warning

Browse Source
This commit is contained in:
Kay Sievers
2006-08-24 10:25:34 +02:00
parent cea61f5c03
commit 5780be9eab
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
udev_db.c
+3 -3
View File
@@ -122,7 +122,7 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
struct stat stats;
char filename[PATH_SIZE];
char line[PATH_SIZE];
unsigned int major, minor;
unsigned int maj, min;
char *bufline;
char *buf;
size_t bufsize;
@@ -176,8 +176,8 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
count = sizeof(line);
memcpy(line, &bufline[2], count-2);
line[count-2] = '\0';
sscanf(line, "%u:%u", &major, &minor);
udev->devt = makedev(major, minor);
sscanf(line, "%u:%u", &maj, &min);
udev->devt = makedev(maj, min);
break;
case 'S':
if (count > sizeof(line))
udev_device.c
+3 -3
View File
@@ -70,13 +70,13 @@ void udev_device_cleanup(struct udevice *udev)
dev_t udev_device_get_devt(struct udevice *udev)
{
const char *attr;
unsigned int major, minor;
unsigned int maj, min;
/* read it from sysfs */
attr = sysfs_attr_get_value(udev->dev->devpath, "dev");
if (attr != NULL) {
if (sscanf(attr, "%u:%u", &major, &minor) == 2)
return makedev(major, minor);
if (sscanf(attr, "%u:%u", &maj, &min) == 2)
return makedev(maj, min);
}
return makedev(0, 0);
}
udevd.c
+5 -5
View File
@@ -567,8 +567,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
int i;
struct udevd_uevent_msg *msg;
char *physdevdriver_key = NULL;
int major = 0;
int minor = 0;
int maj = 0;
int min = 0;
msg = malloc(sizeof(struct udevd_uevent_msg) + buf_size);
if (msg == NULL)
@@ -604,13 +604,13 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
physdevdriver_key = key;
else if (strncmp(key, "MAJOR=", 6) == 0)
major = strtoull(&key[6], NULL, 10);
maj = strtoull(&key[6], NULL, 10);
else if (strncmp(key, "MINOR=", 6) == 0)
minor = strtoull(&key[6], NULL, 10);
min = strtoull(&key[6], NULL, 10);
else if (strncmp(key, "TIMEOUT=", 8) == 0)
msg->timeout = strtoull(&key[8], NULL, 10);
}
msg->devt = makedev(major, minor);
msg->devt = makedev(maj, min);
msg->envp[i++] = "UDEVD_EVENT=1";
if (msg->driver == NULL && msg->physdevpath == NULL && physdevdriver_key != NULL) {