diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2006-08-24 10:25:34 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@suse.de> | 2006-08-24 10:25:34 +0200 |
| commit | 5780be9eab8e72dcce9d8bcfe15e8e1d3ae6bed8 (patch) | |
| tree | a3bce8a5e8cd68067611b54934c17fe73ad87494 /udevd.c | |
| parent | cea61f5c0303d7e2f0886688e789c091d7e4b9e2 (diff) | |
rename major/minor variable to maj/min to avoid warning
Diffstat (limited to 'udevd.c')
| -rw-r--r-- | udevd.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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) { |