add "Persistent Device Naming" rules file for disks

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

diff --git a/extras/volume_id/volume_id/hpfs.c b/extras/volume_id/volume_id/hpfs.c
index a8daea7892568a5501b22d8d0cc9cb78c81da98e..8cd65cd6e9a77de6da77edd402081cfb55429992 100644 (file)
--- a/extras/volume_id/volume_id/hpfs.c
+++ b/extras/volume_id/volume_id/hpfs.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"
@@ -41,24 +40,24 @@
 
 struct hpfs_super
 {
-       __u8    magic[4];
-       __u8    version;
+       uint8_t         magic[4];
+       uint8_t         version;
 } __attribute__((__packed__));
 
 #define HPFS_SUPERBLOCK_OFFSET                 0x2000
 
-int volume_id_probe_hpfs(struct volume_id *id, __u64 off)
+int volume_id_probe_hpfs(struct volume_id *id, uint64_t off)
 {
        struct hpfs_super *hs;
 
-       dbg("probing at offset %llu", off);
+       dbg("probing at offset 0x%llx", (unsigned long long) off);
 
        hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x200);
        if (hs == NULL)
                return -1;
 
        if (memcmp(hs->magic, "\x49\xe8\x95\xf9", 4) == 0) {
-               snprintf(id->type_version, VOLUME_ID_FORMAT_SIZE-1, "%u", hs->version);
+               sprintf(id->type_version, "%u", hs->version);
 
                volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
                id->type = "hpfs";