chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: SUSE update
[elogind.git]
/
udevtrigger.c
diff --git
a/udevtrigger.c
b/udevtrigger.c
index 2bdd0c8d07a0b561bb63e6866f1f2ba0894115e5..3b5be2006e5de952bd2343e5489b8b22fa6bdae6 100644
(file)
--- a/
udevtrigger.c
+++ b/
udevtrigger.c
@@
-118,12
+118,12
@@
static void trigger_uevent(const char *devpath)
fd = open(filename, O_WRONLY);
if (fd < 0) {
fd = open(filename, O_WRONLY);
if (fd < 0) {
- dbg("error on opening %s: %s
\n
", filename, strerror(errno));
+ dbg("error on opening %s: %s", filename, strerror(errno));
return;
}
if (write(fd, "add", 3) < 0)
return;
}
if (write(fd, "add", 3) < 0)
- info("error on triggering %s: %s
\n
", filename, strerror(errno));
+ info("error on triggering %s: %s", filename, strerror(errno));
close(fd);
}
close(fd);
}
@@
-412,8
+412,7
@@
static void scan_failed(void)
if (dent->d_name[0] == '.')
continue;
if (dent->d_name[0] == '.')
continue;
- strlcpy(device, sysfs_path, sizeof(device));
- start = strlcat(device, "/", sizeof(device));
+ start = strlcpy(device, sysfs_path, sizeof(device));
strlcat(device, dent->d_name, sizeof(device));
path_decode(&device[start]);
device_list_insert(device);
strlcat(device, dent->d_name, sizeof(device));
path_decode(&device[start]);
device_list_insert(device);