summaryrefslogtreecommitdiff
path: root/src/hwdb
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-09-18 23:14:18 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-09-19 17:38:07 +0900
commitd6609f828084c47f296ebbd148e823dc576c709b (patch)
tree3fe89b308a253d6b56057360f4afaf8de7919eca /src/hwdb
parente3b9fd0a27a831d362a116ee198063c479b46fe8 (diff)
downloadsystemd-d6609f828084c47f296ebbd148e823dc576c709b.tar.gz
hwdb,udevadm: also unify hwdb_query() and hwdb_test()
Diffstat (limited to 'src/hwdb')
-rw-r--r--src/hwdb/hwdb.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index eb1e88fe1c..be64a26d64 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -7,7 +7,6 @@
#include "alloc-util.h"
#include "hwdb-util.h"
#include "selinux-util.h"
-#include "string-util.h"
#include "terminal-util.h"
#include "util.h"
#include "verbs.h"
@@ -17,24 +16,7 @@ static const char *arg_root = NULL;
static bool arg_strict = false;
static int verb_query(int argc, char *argv[], void *userdata) {
- _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
- const char *key, *value;
- const char *modalias;
- int r;
-
- assert(argc >= 2);
- assert(argv);
-
- modalias = argv[1];
-
- r = sd_hwdb_new(&hwdb);
- if (r < 0)
- return r;
-
- SD_HWDB_FOREACH_PROPERTY(hwdb, modalias, key, value)
- printf("%s=%s\n", key, value);
-
- return 0;
+ return hwdb_query(argv[1]);
}
static int verb_update(int argc, char *argv[], void *userdata) {