chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: correct spacing near eol in code comments
[elogind.git]
/
src
/
core
/
device.c
diff --git
a/src/core/device.c
b/src/core/device.c
index 444286e02b2a7bfc14bd3a5b3c6bab6f10f1955b..c298cd95f69c613bdd17efa02a011a91cb92a705 100644
(file)
--- a/
src/core/device.c
+++ b/
src/core/device.c
@@
-98,7
+98,7
@@
static void device_set_state(Device *d, DeviceState state) {
d->state = state;
if (state != old_state)
d->state = state;
if (state != old_state)
- log_
debug_unit
(UNIT(d)->id,
+ log_
unit_debug
(UNIT(d)->id,
"%s changed %s -> %s", UNIT(d)->id,
device_state_to_string(old_state),
device_state_to_string(state));
"%s changed %s -> %s", UNIT(d)->id,
device_state_to_string(old_state),
device_state_to_string(state));
@@
-220,25
+220,24
@@
static int device_make_description(Unit *u, struct udev_device *dev, const char
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
const char *wants;
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
const char *wants;
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t l;
int r;
size_t l;
int r;
+ const char *property;
assert(u);
assert(dev);
assert(u);
assert(dev);
- wants = udev_device_get_property_value(
- dev,
- u->manager->running_as == SYSTEMD_USER ? "SYSTEMD_USER_WANTS" : "SYSTEMD_WANTS");
-
+ property = u->manager->running_as == SYSTEMD_USER ? "SYSTEMD_USER_WANTS" : "SYSTEMD_WANTS";
+ wants = udev_device_get_property_value(dev, property);
if (!wants)
return 0;
if (!wants)
return 0;
- FOREACH_WORD_QUOTED(w, l, wants, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, wants, state) {
_cleanup_free_ char *n = NULL;
char e[l+1];
_cleanup_free_ char *n = NULL;
char e[l+1];
- memcpy(e, w, l);
+ memcpy(e, w
ord
, l);
e[l] = 0;
n = unit_name_mangle(e, MANGLE_NOGLOB);
e[l] = 0;
n = unit_name_mangle(e, MANGLE_NOGLOB);
@@
-249,6
+248,9
@@
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
if (r < 0)
return r;
}
if (r < 0)
return r;
}
+ if (!isempty(state))
+ log_unit_warning(u->id, "Property %s on %s has trailing garbage, ignoring.",
+ property, strna(udev_device_get_syspath(dev)));
return 0;
}
return 0;
}
@@
-302,7
+304,7
@@
static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
goto fail;
}
goto fail;
}
- r = hashmap_ensure_allocated(&m->devices_by_sysfs,
string_hash_func, string_compare_func
);
+ r = hashmap_ensure_allocated(&m->devices_by_sysfs,
&string_hash_ops
);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-332,7
+334,7
@@
static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
return 0;
fail:
return 0;
fail:
- log_warning
("Failed to load device unit: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to load device unit: %m"
);
if (delete && u)
unit_free(u);
if (delete && u)
unit_free(u);
@@
-380,7
+382,7
@@
static int device_process_new_device(Manager *m, struct udev_device *dev) {
* same /dev/disk/by-label/xxx link because they have
* the same label. We want to make sure that the same
* device that won the symlink wins in systemd, so we
* same /dev/disk/by-label/xxx link because they have
* the same label. We want to make sure that the same
* device that won the symlink wins in systemd, so we
- * check the device node major/minor*/
+ * check the device node major/minor
*/
if (stat(p, &st) >= 0)
if ((!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode)) ||
st.st_rdev != udev_device_get_devnum(dev))
if (stat(p, &st) >= 0)
if ((!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode)) ||
st.st_rdev != udev_device_get_devnum(dev))
@@
-393,13
+395,13
@@
static int device_process_new_device(Manager *m, struct udev_device *dev) {
* aliases */
alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
if (alias) {
* aliases */
alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
if (alias) {
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t l;
size_t l;
- FOREACH_WORD_QUOTED(w, l, alias, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, alias, state) {
char e[l+1];
char e[l+1];
- memcpy(e, w, l);
+ memcpy(e, w
ord
, l);
e[l] = 0;
if (path_is_absolute(e))
e[l] = 0;
if (path_is_absolute(e))
@@
-407,6
+409,8
@@
static int device_process_new_device(Manager *m, struct udev_device *dev) {
else
log_warning("SYSTEMD_ALIAS for %s is not an absolute path, ignoring: %s", sysfs, e);
}
else
log_warning("SYSTEMD_ALIAS for %s is not an absolute path, ignoring: %s", sysfs, e);
}
+ if (!isempty(state))
+ log_warning("SYSTEMD_ALIAS for %s has trailing garbage, ignoring.", sysfs);
}
return 0;
}
return 0;
@@
-513,7
+517,7
@@
static int device_following_set(Unit *u, Set **_set) {
return 0;
}
return 0;
}
- set = set_new(NULL
, NULL
);
+ set = set_new(NULL);
if (!set)
return -ENOMEM;
if (!set)
return -ENOMEM;
@@
-624,7
+628,7
@@
static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
if (!ratelimit_test(&limit))
static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
if (!ratelimit_test(&limit))
- log_error
(
"Failed to get udev event: %m");
+ log_error
_errno(errno,
"Failed to get udev event: %m");
if (!(revents & EPOLLIN))
return 0;
}
if (!(revents & EPOLLIN))
return 0;
}
@@
-646,20
+650,20
@@
static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
if (streq(action, "remove") || !device_is_ready(dev)) {
r = device_process_removed_device(m, dev);
if (r < 0)
if (streq(action, "remove") || !device_is_ready(dev)) {
r = device_process_removed_device(m, dev);
if (r < 0)
- log_error
("Failed to process device remove event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process device remove event: %m"
);
r = swap_process_removed_device(m, dev);
if (r < 0)
r = swap_process_removed_device(m, dev);
if (r < 0)
- log_error
("Failed to process swap device remove event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process swap device remove event: %m"
);
} else {
r = device_process_new_device(m, dev);
if (r < 0)
} else {
r = device_process_new_device(m, dev);
if (r < 0)
- log_error
("Failed to process device new event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process device new event: %m"
);
r = swap_process_new_device(m, dev);
if (r < 0)
r = swap_process_new_device(m, dev);
if (r < 0)
- log_error
("Failed to process swap device new event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process swap device new event: %m"
);
manager_dispatch_load_queue(m);
manager_dispatch_load_queue(m);