fix GGC signed pointer warnings and switch volume_id to stdint

[elogind.git] / extras / volume_id / volume_id / romfs.c

diff --git a/extras/volume_id/volume_id/romfs.c b/extras/volume_id/volume_id/romfs.c
index fe5e5a4827cae93521c6e8e161001e13fa5edbb7..3d7df2443f4ca3a2640452faa30e5ba8db02382c 100644 (file)
--- a/extras/volume_id/volume_id/romfs.c
+++ b/extras/volume_id/volume_id/romfs.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,24 +39,24 @@
 #include "romfs.h"
 
 struct romfs_super {
-       __u8 magic[8];
-       __u32 size;
-       __u32 checksum;
-       __u8 name[0];
+       uint8_t magic[8];
+       uint32_t size;
+       uint32_t checksum;
+       uint8_t name[0];
 } __attribute__((__packed__));
 
-int volume_id_probe_romfs(struct volume_id *id, __u64 off)
+int volume_id_probe_romfs(struct volume_id *id, uint64_t off)
 {
        struct romfs_super *rfs;
 
-       dbg("probing at offset %llu", off);
+       dbg("probing at offset 0x%llx", (unsigned long long) off);
 
        rfs = (struct romfs_super *) volume_id_get_buffer(id, off, 0x200);
        if (rfs == NULL)
                return -1;
 
        if (memcmp(rfs->magic, "-rom1fs-", 4) == 0) {
-               size_t len = strlen(rfs->name);
+               size_t len = strlen((char *)rfs->name);
 
                if (len) {
                        volume_id_set_label_raw(id, rfs->name, len);