make: do not delete autotools generated file with distclean

[elogind.git] / extras / volume_id / lib / util.c

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 0fb8937962b2e08d3bade17dca2128c83d3580a7..9844e5e97cf2bbd58b2436e72aa5b4daf1af351c 100644 (file)
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -200,12 +200,8 @@ static char *usage_to_string(enum volume_id_usage usage_id)
                return "other";
        case VOLUME_ID_RAID:
                return "raid";
-       case VOLUME_ID_DISKLABEL:
-               return "disklabel";
        case VOLUME_ID_CRYPTO:
                return "crypto";
-       case VOLUME_ID_UNPROBED:
-               return "unprobed";
        case VOLUME_ID_UNUSED:
                return "unused";
        }
@@ -352,7 +348,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 {
        ssize_t buf_len;
 
-       info("get buffer off 0x%llx(%llu), len 0x%zx\n", (unsigned long long) off, (unsigned long long) off, len);
+       info("get buffer off 0x%" PRIx64 "(%" PRIu64 "), len 0x%zx\n", off, off, len);
        /* check if requested area fits in superblock buffer */
        if (off + len <= SB_BUFFER_SIZE) {
                if (id->sbbuf == NULL) {
@@ -365,7 +361,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
                /* check if we need to read */
                if ((off + len) > id->sbbuf_len) {
-                       info("read sbbuf len:0x%llx\n", (unsigned long long) (off + len));
+                       info("read sbbuf len:0x%" PRIx64 "\n", (off + len));
                        if (lseek(id->fd, 0, SEEK_SET) < 0) {
                                dbg("lseek failed (%s)\n", strerror(errno));
                                return NULL;
@@ -401,7 +397,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
                /* check if we need to read */
                if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
-                       info("read seekbuf off:0x%llx len:0x%zx\n", (unsigned long long) off, len);
+                       info("read seekbuf off:0x%" PRIx64 " len:0x%zx\n", off, len);
                        if (lseek(id->fd, off, SEEK_SET) < 0) {
                                dbg("lseek failed (%s)\n", strerror(errno));
                                return NULL;