X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=7c917fd56e64b2ac50812275a4b8963789bfd099;hb=5780be9eab8e72dcce9d8bcfe15e8e1d3ae6bed8;hp=de7cace3e191a962d5746efec0957c13436e1b4a;hpb=cea61f5c0303d7e2f0886688e789c091d7e4b9e2;p=elogind.git

diff --git a/udevd.c b/udevd.c
index de7cace3e..7c917fd56 100644
--- a/udevd.c
+++ b/udevd.c
@@ -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) {