chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/hotplug/udev
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
cramfs.c
diff --git
a/extras/volume_id/volume_id/cramfs.c
b/extras/volume_id/volume_id/cramfs.c
index a8058646d12686c19246ac89436b20b764193d3e..9a71b0265c65e5ddcb8a79a829cb0680ca11f0d1 100644
(file)
--- a/
extras/volume_id/volume_id/cramfs.c
+++ b/
extras/volume_id/volume_id/cramfs.c
@@
-32,7
+32,6
@@
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include <asm/types.h>
#include "volume_id.h"
#include "logging.h"
#include "volume_id.h"
#include "logging.h"
@@
-40,25
+39,25
@@
#include "cramfs.h"
struct cramfs_super {
#include "cramfs.h"
struct cramfs_super {
-
__u8
magic[4];
-
__u32
size;
-
__u32
flags;
-
__u32
future;
-
__u8
signature[16];
+
uint8_t
magic[4];
+
uint32_t
size;
+
uint32_t
flags;
+
uint32_t
future;
+
uint8_t
signature[16];
struct cramfs_info {
struct cramfs_info {
-
__u32
crc;
-
__u32
edition;
-
__u32
blocks;
-
__u32
files;
+
uint32_t
crc;
+
uint32_t
edition;
+
uint32_t
blocks;
+
uint32_t
files;
} __attribute__((__packed__)) info;
} __attribute__((__packed__)) info;
-
__u8
name[16];
+
uint8_t
name[16];
} __attribute__((__packed__));
} __attribute__((__packed__));
-int volume_id_probe_cramfs(struct volume_id *id,
__u64
off)
+int volume_id_probe_cramfs(struct volume_id *id,
uint64_t
off)
{
struct cramfs_super *cs;
{
struct cramfs_super *cs;
- dbg("probing at offset
%llu",
off);
+ dbg("probing at offset
0x%llx", (unsigned long long)
off);
cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200);
if (cs == NULL)
cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200);
if (cs == NULL)