diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-03 13:59:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 13:59:20 -0600 |
| commit | 493fd52f1ada36bfe63301d4bb50f7fd2b38c670 (patch) | |
| tree | 19864f5568a2fe48181c1b3f33c46b4db36dd768 /src/udev | |
| parent | a1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff) | |
| parent | 9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff) | |
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-builtin-hwdb.c | 2 | ||||
| -rw-r--r-- | src/udev/udevadm-hwdb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index f4a065a97d..acd1d1a6de 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -43,7 +43,7 @@ int udev_builtin_hwdb_lookup(struct udev_device *dev, return -ENOENT; if (prefix) { - lookup = strjoin(prefix, modalias, NULL); + lookup = strjoin(prefix, modalias); if (!lookup) return -ENOMEM; modalias = lookup; diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 1bffe8e8ab..70a5fa4d7a 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -653,7 +653,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { log_debug("strings dedup'ed: %8zu bytes (%8zu)", trie->strings->dedup_len, trie->strings->dedup_count); - hwdb_bin = strjoin(root, "/", hwdb_bin_dir, "/hwdb.bin", NULL); + hwdb_bin = strjoin(root, "/", hwdb_bin_dir, "/hwdb.bin"); if (!hwdb_bin) { rc = EXIT_FAILURE; goto out; |