chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gcc: make a couple of gcc warnings go away
[elogind.git]
/
device.c
diff --git
a/device.c
b/device.c
index c5901c95ff67697973ed4d22bc7bb65ddb1f5a9b..6de7d518c718cfc30496f7a5fb45f9824a25ad2e 100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-162,9
+162,12
@@
static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
}
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
}
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
- (model = udev_device_get_property_value(dev, "ID_MODEL")))
+ (model = udev_device_get_property_value(dev, "ID_MODEL")))
{
if ((r = unit_set_description(u, model)) < 0)
goto fail;
if ((r = unit_set_description(u, model)) < 0)
goto fail;
+ } else if (dn)
+ if ((r = unit_set_description(u, dn)) < 0)
+ goto fail;
unit_add_to_load_queue(u);
} else {
unit_add_to_load_queue(u);
} else {
@@
-183,8
+186,10
@@
static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
if (names) {
FOREACH_WORD(w, l, names, state) {
if (names) {
FOREACH_WORD(w, l, names, state) {
- if (!(e = strndup(w, l)))
+ if (!(e = strndup(w, l))) {
+ r = -ENOMEM;
goto fail;
goto fail;
+ }
r = unit_add_name(u, e);
free(e);
r = unit_add_name(u, e);
free(e);
@@
-196,8
+201,10
@@
static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
if (wants) {
FOREACH_WORD(w, l, wants, state) {
if (wants) {
FOREACH_WORD(w, l, wants, state) {
- if (!(e = strndup(w, l)))
+ if (!(e = strndup(w, l))) {
+ r = -ENOMEM;
goto fail;
goto fail;
+ }
r = unit_add_dependency_by_name(u, UNIT_WANTS, e);
free(e);
r = unit_add_dependency_by_name(u, UNIT_WANTS, e);
free(e);