volume_id: provide a custom debug function

[elogind.git] / extras / volume_id / libvolume_id / cramfs.c

diff --git a/extras/volume_id/libvolume_id/cramfs.c b/extras/volume_id/libvolume_id/cramfs.c
index 0ad5886b324fa4844493cbf8bf15d5ab40f01f91..beb34d5bc0442e13202cdaa891aa74371a3a7f7e 100644 (file)
--- a/extras/volume_id/libvolume_id/cramfs.c
+++ b/extras/volume_id/libvolume_id/cramfs.c
@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct cramfs_super {
@@ -38,9 +37,9 @@ struct cramfs_super {
                uint32_t        edition;
                uint32_t        blocks;
                uint32_t        files;
-       } __attribute__((__packed__)) info;
+       } PACKED info;
        uint8_t         name[16];
-} __attribute__((__packed__));
+} PACKED;
 
 int volume_id_probe_cramfs(struct volume_id *id, uint64_t off)
 {
@@ -52,7 +51,7 @@ int volume_id_probe_cramfs(struct volume_id *id, uint64_t off)
        if (cs == NULL)
                return -1;
 
-       if (memcmp(cs->magic, "\x45\x3d\xcd\x28", 4) == 0) {
+       if (memcmp(cs->magic, "\x45\x3d\xcd\x28", 4) == 0 || memcmp(cs->magic, "\x28\xcd\x3d\x45", 4) == 0) {
                volume_id_set_label_raw(id, cs->name, 16);
                volume_id_set_label_string(id, cs->name, 16);