chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: gracefully handle failure to emit signals when dbus is not connected
[elogind.git]
/
src
/
libudev
/
libudev-util.c
diff --git
a/src/libudev/libudev-util.c
b/src/libudev/libudev-util.c
index f3fdf3b5aa7843fd91789ab732ec370002f1150f..291829e6d89ce7ea8d7856b1a8b37f898586c2d5 100644
(file)
--- a/
src/libudev/libudev-util.c
+++ b/
src/libudev/libudev-util.c
@@
-93,7
+93,7
@@
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
strscpy(result, maxsize, val);
else
result[0] = '\0';
strscpy(result, maxsize, val);
else
result[0] = '\0';
-
udev_dbg(udev, "value '[%s/%s]%s' is '%s'\n
", subsys, sysname, attr, result);
+
log_debug("value '[%s/%s]%s' is '%s'
", subsys, sysname, attr, result);
} else {
size_t l;
char *s;
} else {
size_t l;
char *s;
@@
-102,7
+102,7
@@
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
l = strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
if (attr != NULL)
strpcpyl(&s, l, "/", attr, NULL);
l = strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
if (attr != NULL)
strpcpyl(&s, l, "/", attr, NULL);
-
udev_dbg(udev, "path '[%s/%s]%s' is '%s'\n
", subsys, sysname, attr, result);
+
log_debug("path '[%s/%s]%s' is '%s'
", subsys, sysname, attr, result);
}
udev_device_unref(dev);
return 0;
}
udev_device_unref(dev);
return 0;
@@
-159,9
+159,13
@@
int util_log_priority(const char *priority)
char *endptr;
int prio;
char *endptr;
int prio;
- prio = strtol(priority, &endptr, 10);
- if (endptr[0] == '\0' || isspace(endptr[0]))
- return prio;
+ prio = strtoul(priority, &endptr, 10);
+ if (endptr[0] == '\0' || isspace(endptr[0])) {
+ if (prio >= 0 && prio <= 7)
+ return prio;
+ else
+ return -ERANGE;
+ }
return log_level_from_string(priority);
}
return log_level_from_string(priority);
}