X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibudev%2Flibudev-hwdb.c;h=ff34e5a2cd75a313395da9964216825477c948a9;hp=b53b35ce4a754c80e30cf3f01e934632775ddb0f;hb=051dfe8708e394a64e8ef6c281228763481ad32c;hpb=725d7e6cebcafef3bd4adbf76c8fa73a9b18972e diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c index b53b35ce4..ff34e5a2c 100644 --- a/src/libudev/libudev-hwdb.c +++ b/src/libudev/libudev-hwdb.c @@ -277,38 +277,38 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) { hwdb->f = fopen("/etc/udev/hwdb.bin", "re"); if (!hwdb->f) { - log_debug("error reading /etc/udev/hwdb.bin: %m"); + udev_dbg(udev, "error reading /etc/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 /etc/udev/hwdb.bin: %m"); + udev_dbg(udev, "error reading /etc/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 /etc/udev/hwdb.bin: %m"); + udev_dbg(udev, "error mapping /etc/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 /etc/udev/hwdb.bin"); + udev_dbg(udev, "error recognizing the format of /etc/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; }