summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-15 19:48:21 +0100
committerTom Gundersen <teg@jklm.no>2014-12-15 20:40:09 +0100
commitd640c07d97eb19003226257b703eaa6cf1cbb4cf (patch)
tree272f7cd4accf37835883d05ac2bfbc1f53845d9a /src
parent81fd1dd3a2cf4cc90a6898d562c9bb0fb238cbd7 (diff)
udevadm: port to sd-hwdb
Diffstat (limited to 'src')
-rw-r--r--src/udev/udevadm-hwdb.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index afd9f5a539..eb300fff6a 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -29,6 +29,7 @@
#include "udev.h"
#include "hwdb-internal.h"
+#include "hwdb-util.h"
/*
* Generic udev properties, key/value database based on modalias strings.
@@ -662,14 +663,15 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
}
if (test) {
- struct udev_hwdb *hwdb = udev_hwdb_new(udev);
+ _cleanup_hwdb_unref_ sd_hwdb *hwdb = NULL;
+ int r;
- if (hwdb) {
- struct udev_list_entry *entry;
+ r = sd_hwdb_new(&hwdb);
+ if (r >= 0) {
+ const char *key, *value;
- udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, test, 0))
- printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry));
- udev_hwdb_unref(hwdb);
+ SD_HWDB_FOREACH_PROPERTY(hwdb, test, key, value)
+ printf("%s=%s\n", key, value);
}
}
out: