summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-10-25 21:40:01 +0200
committerKay Sievers <kay@vrfy.org>2012-10-25 21:44:33 +0200
commit1c574591db5a62aa40aaac02645be1521ea85771 (patch)
treeee7c8b1651e5b52fea0811e81a0514f0d5100a2f
parentudev: hwdb - properly initialize search structure (diff)
downloadsystemd-1c574591db5a62aa40aaac02645be1521ea85771.tar.xz
systemd-1c574591db5a62aa40aaac02645be1521ea85771.zip
udev: hwdb - remove run_once
-rw-r--r--src/shared/util.c3
-rw-r--r--src/udev/udev-builtin-hwdb.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index 2f0aba88ae..a73443d535 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -6072,8 +6072,7 @@ finish:
/* hey glibc, APIs with callbacks without a user pointer are so useless */
void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
- int (*compar) (const void *, const void *, void *),
- void *arg) {
+ int (*compar) (const void *, const void *, void *), void *arg) {
size_t l, u, idx;
const void *p;
int comparison;
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 5ccd06df04..4c3d5aea62 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -371,5 +371,4 @@ const struct udev_builtin udev_builtin_hwdb = {
.exit = builtin_hwdb_exit,
.validate = builtin_hwdb_validate,
.help = "hardware database",
- .run_once = true,
};