chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow C99 statements
[elogind.git]
/
udev_db.c
diff --git
a/udev_db.c
b/udev_db.c
index e2b7b4d9214e6a40b53f27eca451b41e71e56ea0..6e9a1187d03f4c94d0d19e1c609da5c6a65a97c1 100644
(file)
--- a/
udev_db.c
+++ b/
udev_db.c
@@
-43,8
+43,7
@@
static int devpath_to_db_path(const char *devpath, char *filename, size_t len)
/* add location of db files */
strlcpy(filename, udev_root, len);
/* add location of db files */
strlcpy(filename, udev_root, len);
- strlcat(filename, "/", len);
- start = strlcat(filename, DB_DIR, len);
+ start = strlcat(filename, "/"DB_DIR, len);
end = strlcat(filename, devpath, len);
if (end > len)
end = len;
end = strlcat(filename, devpath, len);
if (end > len)
end = len;
@@
-210,8
+209,7
@@
int udev_db_lookup_name(const char *name, char *devpath, size_t len)
int found = 0;
strlcpy(dbpath, udev_root, sizeof(dbpath));
int found = 0;
strlcpy(dbpath, udev_root, sizeof(dbpath));
- strlcat(dbpath, "/", sizeof(dbpath));
- strlcat(dbpath, DB_DIR, sizeof(dbpath));
+ strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
dir = opendir(dbpath);
if (dir == NULL) {
err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
dir = opendir(dbpath);
if (dir == NULL) {
err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
@@
-282,8
+280,7
@@
int udev_db_get_all_entries(struct list_head *name_list)
DIR *dir;
strlcpy(dbpath, udev_root, sizeof(dbpath));
DIR *dir;
strlcpy(dbpath, udev_root, sizeof(dbpath));
- strlcat(dbpath, "/", sizeof(dbpath));
- strlcat(dbpath, DB_DIR, sizeof(dbpath));
+ strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
dir = opendir(dbpath);
if (dir == NULL) {
err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
dir = opendir(dbpath);
if (dir == NULL) {
err("unable to open udev_db '%s': %s", dbpath, strerror(errno));