summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-01-09 16:36:52 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-01-09 16:37:12 -0500
commit46029d273782b441895b23bf5720ebe23d42351f (patch)
tree5e8e581c0805e91a9ea1002b84b0a5d723a8c3b3
parentd33d0eab61df4088a2e1927d6b44c7a4c623c1f7 (diff)
libudev: hwdb - use libudev not systemd logging
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/libudev/libudev-hwdb.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 9368600b25..993812e1c0 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -277,38 +277,39 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
hwdb->f = fopen(UDEV_HWDB_BIN, "re");
if (!hwdb->f) {
- log_debug("error reading " UDEV_HWDB_BIN ": %m");
+ udev_dbg(udev, "error reading " UDEV_HWDB_BIN ": %m");
udev_hwdb_unref(hwdb);
return NULL;
}
if (fstat(fileno(hwdb->f), &hwdb->st) < 0 ||
(size_t)hwdb->st.st_size < offsetof(struct trie_header_f, strings_len) + 8) {
- log_debug("error reading " UDEV_HWDB_BIN ": %m");
+ udev_dbg(udev, "error reading " UDEV_HWDB_BIN ": %m");
udev_hwdb_unref(hwdb);
return NULL;
}
hwdb->map = mmap(0, hwdb->st.st_size, PROT_READ, MAP_SHARED, fileno(hwdb->f), 0);
if (hwdb->map == MAP_FAILED) {
- log_debug("error mapping " UDEV_HWDB_BIN ": %m");
+ udev_dbg(udev, "error mapping " UDEV_HWDB_BIN ": %m");
udev_hwdb_unref(hwdb);
return NULL;
}
if (memcmp(hwdb->map, sig, sizeof(hwdb->head->signature)) != 0 ||
(size_t)hwdb->st.st_size != le64toh(hwdb->head->file_size)) {
- log_debug("error recognizing the format of " UDEV_HWDB_BIN);
+ udev_dbg(udev, "error recognizing the format of " UDEV_HWDB_BIN);
udev_hwdb_unref(hwdb);
return NULL;
}
- log_debug("=== trie on-disk ===\n");
- log_debug("tool version: %"PRIu64, le64toh(hwdb->head->tool_version));
- log_debug("file size: %8llu bytes\n", (unsigned long long) hwdb->st.st_size);
- log_debug("header size %8"PRIu64" bytes\n", le64toh(hwdb->head->header_size));
- log_debug("strings %8"PRIu64" bytes\n", le64toh(hwdb->head->strings_len));
- log_debug("nodes %8"PRIu64" bytes\n", le64toh(hwdb->head->nodes_len));
+ udev_dbg(udev, "=== trie on-disk ===\n");
+ udev_dbg(udev, "tool version: %"PRIu64, le64toh(hwdb->head->tool_version));
+ udev_dbg(udev, "file size: %8llu bytes\n", (unsigned long long) hwdb->st.st_size);
+ udev_dbg(udev, "header size %8"PRIu64" bytes\n", le64toh(hwdb->head->header_size));
+ udev_dbg(udev, "strings %8"PRIu64" bytes\n", le64toh(hwdb->head->strings_len));
+ udev_dbg(udev, "nodes %8"PRIu64" bytes\n", le64toh(hwdb->head->nodes_len));
+
return hwdb;
}