picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libudev: modernization 

This brings udev logging style a bit closer to normal systemd convention.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-11-01 11:32:44 -04:00
parent 1caa12d0a8
commit fe756ed9ec
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libudev/libudev.c
View File

@ -119,7 +119,7 @@ _public_ struct udev *udev_new(void)
{
struct udev *udev;
const char *env;
FILE *f;
_cleanup_free_ FILE *f = NULL;
udev = new0(struct udev, 1);
if (udev == NULL)
@ -132,7 +132,7 @@ _public_ struct udev *udev_new(void)
f = fopen("/etc/udev/udev.conf", "re");
if (f != NULL) {
char line[UTIL_LINE_SIZE];
int line_nr = 0;
unsigned line_nr = 0;
while (fgets(line, sizeof(line), f)) {
size_t len;
@ -153,7 +153,7 @@ _public_ struct udev *udev_new(void)
/* split key/value */
val = strchr(key, '=');
if (val == NULL) {
udev_err(udev, "missing <key>=<value> in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
udev_err(udev, "/etc/udev/udev.conf:%u: missing assignment, skipping line.\n", line_nr);
continue;
}
val[0] = '\0';
@ -185,7 +185,7 @@ _public_ struct udev *udev_new(void)
/* unquote */
if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) {
udev_err(udev, "inconsistent quoting in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
udev_err(udev, "/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.\n", line_nr);
continue;
}
val[len-1] = '\0';
@ -197,7 +197,6 @@ _public_ struct udev *udev_new(void)
continue;
}
}
fclose(f);
}
/* environment overrides config */