chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename major/minor variable to maj/min to avoid warning
[elogind.git]
/
udev_db.c
diff --git
a/udev_db.c
b/udev_db.c
index 99d73bd5afba9d11f4cb7feb1f650e8236ddba75..797d0eeffbf4c036f3f64ada553e5fcafdde2020 100644
(file)
--- a/
udev_db.c
+++ b/
udev_db.c
@@
-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];
struct stat stats;
char filename[PATH_SIZE];
char line[PATH_SIZE];
- unsigned int maj
or, minor
;
+ unsigned int maj
, min
;
char *bufline;
char *buf;
size_t bufsize;
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';
count = sizeof(line);
memcpy(line, &bufline[2], count-2);
line[count-2] = '\0';
- sscanf(line, "%u:%u", &maj
or, &minor
);
- udev->devt = makedev(maj
or, minor
);
+ sscanf(line, "%u:%u", &maj
, &min
);
+ udev->devt = makedev(maj
, min
);
break;
case 'S':
if (count > sizeof(line))
break;
case 'S':
if (count > sizeof(line))