Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
shlibs/blkid/src/blkidP.h | 2 +-
shlibs/blkid/src/superblocks/befs.c | 2 +-
shlibs/blkid/src/superblocks/bfs.c | 2 +-
shlibs/blkid/src/superblocks/btrfs.c | 2 +-
shlibs/blkid/src/superblocks/cramfs.c | 2 +-
shlibs/blkid/src/superblocks/exfat.c | 2 +-
shlibs/blkid/src/superblocks/ext.c | 2 +-
shlibs/blkid/src/superblocks/gfs.c | 4 ++--
shlibs/blkid/src/superblocks/hfs.c | 4 ++--
shlibs/blkid/src/superblocks/highpoint_raid.c | 2 +-
shlibs/blkid/src/superblocks/hpfs.c | 2 +-
shlibs/blkid/src/superblocks/iso9660.c | 2 +-
shlibs/blkid/src/superblocks/jfs.c | 2 +-
shlibs/blkid/src/superblocks/luks.c | 2 +-
shlibs/blkid/src/superblocks/lvm.c | 6 +++---
shlibs/blkid/src/superblocks/minix.c | 2 +-
shlibs/blkid/src/superblocks/netware.c | 2 +-
shlibs/blkid/src/superblocks/nilfs.c | 2 +-
shlibs/blkid/src/superblocks/ntfs.c | 2 +-
shlibs/blkid/src/superblocks/ocfs.c | 6 +++---
shlibs/blkid/src/superblocks/reiserfs.c | 4 ++--
shlibs/blkid/src/superblocks/romfs.c | 2 +-
shlibs/blkid/src/superblocks/squashfs.c | 2 +-
shlibs/blkid/src/superblocks/superblocks.h | 2 ++
shlibs/blkid/src/superblocks/swap.c | 4 ++--
shlibs/blkid/src/superblocks/sysv.c | 2 +-
shlibs/blkid/src/superblocks/ubifs.c | 2 +-
shlibs/blkid/src/superblocks/udf.c | 2 +-
shlibs/blkid/src/superblocks/vfat.c | 2 +-
shlibs/blkid/src/superblocks/vmfs.c | 4 ++--
shlibs/blkid/src/superblocks/vxfs.c | 2 +-
shlibs/blkid/src/superblocks/xfs.c | 2 +-
32 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/shlibs/blkid/src/blkidP.h b/shlibs/blkid/src/blkidP.h
index 5bf9cca..da5ef93 100644
--- a/shlibs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
@@ -165,7 +165,7 @@ struct blkid_idinfo
struct blkid_idmag magics[]; /* NULL or array with magic strings */
};
-#define BLKID_NONE_MAGIC {{ NULL }}
+#define BLKID_NONE_MAGIC {{ NULL, 0, 0, 0 }}
/*
* tolerant FS - can share the same device with more filesystems (e.g. typical
diff --git a/shlibs/blkid/src/superblocks/befs.c b/shlibs/blkid/src/superblocks/befs.c
index c78dc20..2677ed0 100644
--- a/shlibs/blkid/src/superblocks/befs.c
+++ b/shlibs/blkid/src/superblocks/befs.c
@@ -465,6 +465,6 @@ const struct blkid_idinfo befs_idinfo =
B_OS_NAME_LENGTH },
{ .magic = "1SFB", .len = 4, .sboff = 0x200 +
B_OS_NAME_LENGTH },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/bfs.c b/shlibs/blkid/src/superblocks/bfs.c
index 8a34c58..9974c28 100644
--- a/shlibs/blkid/src/superblocks/bfs.c
+++ b/shlibs/blkid/src/superblocks/bfs.c
@@ -18,6 +18,6 @@ const struct blkid_idinfo bfs_idinfo =
.usage = BLKID_USAGE_FILESYSTEM,
.magics = {
{ .magic = "\xce\xfa\xad\x1b", .len = 4 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/btrfs.c b/shlibs/blkid/src/superblocks/btrfs.c
index 51bbadc..e1c7ad0 100644
--- a/shlibs/blkid/src/superblocks/btrfs.c
+++ b/shlibs/blkid/src/superblocks/btrfs.c
@@ -87,7 +87,7 @@ const struct blkid_idinfo btrfs_idinfo =
.magics =
{
{ .magic = "_BHRfS_M", .len = 8, .kboff = 64, .sboff = 0x40 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/cramfs.c b/shlibs/blkid/src/superblocks/cramfs.c
index b58ed08..65736c4 100644
--- a/shlibs/blkid/src/superblocks/cramfs.c
+++ b/shlibs/blkid/src/superblocks/cramfs.c
@@ -55,7 +55,7 @@ const struct blkid_idinfo cramfs_idinfo =
{
{ "\x45\x3d\xcd\x28", 4, 0, 0 },
{ "\x28\xcd\x3d\x45", 4, 0, 0 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/exfat.c b/shlibs/blkid/src/superblocks/exfat.c
index bada3a8..5acece4 100644
--- a/shlibs/blkid/src/superblocks/exfat.c
+++ b/shlibs/blkid/src/superblocks/exfat.c
@@ -141,6 +141,6 @@ const struct blkid_idinfo exfat_idinfo =
.magics =
{
{ .magic = "EXFAT ", .len = 8, .sboff = 3 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/ext.c b/shlibs/blkid/src/superblocks/ext.c
index 6dfe528..f78fb23 100644
--- a/shlibs/blkid/src/superblocks/ext.c
+++ b/shlibs/blkid/src/superblocks/ext.c
@@ -481,7 +481,7 @@ force_ext4:
.kboff = EXT_SB_KBOFF, \
.sboff = EXT_MAG_OFF \
}, \
- { NULL } \
+ { NULL, 0, 0, 0 } \
}
const struct blkid_idinfo jbd_idinfo =
diff --git a/shlibs/blkid/src/superblocks/gfs.c b/shlibs/blkid/src/superblocks/gfs.c
index b2c0163..bd5dbcc 100644
--- a/shlibs/blkid/src/superblocks/gfs.c
+++ b/shlibs/blkid/src/superblocks/gfs.c
@@ -112,7 +112,7 @@ const struct blkid_idinfo gfs_idinfo =
.magics =
{
{ .magic = "\x01\x16\x19\x70", .len = 4, .kboff = 64 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -125,7 +125,7 @@ const struct blkid_idinfo gfs2_idinfo =
.magics =
{
{ .magic = "\x01\x16\x19\x70", .len = 4, .kboff = 64 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/hfs.c b/shlibs/blkid/src/superblocks/hfs.c
index 033a65d..c73aad5 100644
--- a/shlibs/blkid/src/superblocks/hfs.c
+++ b/shlibs/blkid/src/superblocks/hfs.c
@@ -295,7 +295,7 @@ const struct blkid_idinfo hfs_idinfo =
.magics =
{
{ .magic = "BD", .len = 2, .kboff = 1 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -309,6 +309,6 @@ const struct blkid_idinfo hfsplus_idinfo =
{ .magic = "BD", .len = 2, .kboff = 1 },
{ .magic = "H+", .len = 2, .kboff = 1 },
{ .magic = "HX", .len = 2, .kboff = 1 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c
index 25e3114..2b829f3 100644
--- a/shlibs/blkid/src/superblocks/highpoint_raid.c
+++ b/shlibs/blkid/src/superblocks/highpoint_raid.c
@@ -78,7 +78,7 @@ const struct blkid_idinfo highpoint37x_idinfo = {
*/
{ .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
{ .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/hpfs.c b/shlibs/blkid/src/superblocks/hpfs.c
index f9b851a..5759956 100644
--- a/shlibs/blkid/src/superblocks/hpfs.c
+++ b/shlibs/blkid/src/superblocks/hpfs.c
@@ -115,7 +115,7 @@ const struct blkid_idinfo hpfs_idinfo =
.len = 4,
.kboff = (HPFS_SB_OFFSET >> 10)
},
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/iso9660.c b/shlibs/blkid/src/superblocks/iso9660.c
index 9f3ce2e..db2acee 100644
--- a/shlibs/blkid/src/superblocks/iso9660.c
+++ b/shlibs/blkid/src/superblocks/iso9660.c
@@ -147,7 +147,7 @@ const struct blkid_idinfo iso9660_idinfo =
{
{ .magic = "CD001", .len = 5, .kboff = 32, .sboff = 1 },
{ .magic = "CDROM", .len = 5, .kboff = 32, .sboff = 9 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/jfs.c b/shlibs/blkid/src/superblocks/jfs.c
index 9a49c67..16de599 100644
--- a/shlibs/blkid/src/superblocks/jfs.c
+++ b/shlibs/blkid/src/superblocks/jfs.c
@@ -65,7 +65,7 @@ const struct blkid_idinfo jfs_idinfo =
.magics =
{
{ .magic = "JFS1", .len = 4, .kboff = 32 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/luks.c b/shlibs/blkid/src/superblocks/luks.c
index f716e31..ef3039c 100644
--- a/shlibs/blkid/src/superblocks/luks.c
+++ b/shlibs/blkid/src/superblocks/luks.c
@@ -61,6 +61,6 @@ const struct blkid_idinfo luks_idinfo =
.magics =
{
{ .magic = "LUKS\xba\xbe", .len = 6 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/lvm.c b/shlibs/blkid/src/superblocks/lvm.c
index facf703..f9e995d 100644
--- a/shlibs/blkid/src/superblocks/lvm.c
+++ b/shlibs/blkid/src/superblocks/lvm.c
@@ -148,7 +148,7 @@ const struct blkid_idinfo lvm2_idinfo =
{ .magic = "LVM2 001", .len = 8, .sboff = 0x018 },
{ .magic = "LVM2 001", .len = 8, .kboff = 1, .sboff = 0x018 },
{ .magic = "LVM2 001", .len = 8, .kboff = 1, .sboff = 0x218 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -160,7 +160,7 @@ const struct blkid_idinfo lvm1_idinfo =
.magics =
{
{ .magic = "HM", .len = 2 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -171,6 +171,6 @@ const struct blkid_idinfo snapcow_idinfo =
.magics =
{
{ .magic = "SnAp", .len = 4 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/minix.c b/shlibs/blkid/src/superblocks/minix.c
index 3290c27..93d3279 100644
--- a/shlibs/blkid/src/superblocks/minix.c
+++ b/shlibs/blkid/src/superblocks/minix.c
@@ -119,7 +119,7 @@ const struct blkid_idinfo minix_idinfo =
/* version 3 */
{ .magic = "\132\115", .len = 2, .kboff = 1, .sboff = 0x18 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/netware.c b/shlibs/blkid/src/superblocks/netware.c
index 7ef2162..d957f41 100644
--- a/shlibs/blkid/src/superblocks/netware.c
+++ b/shlibs/blkid/src/superblocks/netware.c
@@ -90,7 +90,7 @@ const struct blkid_idinfo netware_idinfo =
.magics =
{
{ .magic = "SPB5", .len = 4, .kboff = 4 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c
index 1f8f3a6..df167da 100644
--- a/shlibs/blkid/src/superblocks/nilfs.c
+++ b/shlibs/blkid/src/superblocks/nilfs.c
@@ -115,6 +115,6 @@ const struct blkid_idinfo nilfs2_idinfo =
.kboff = NILFS_SB_KBOFF,
.sboff = NILFS_MAG_OFF
},
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/ntfs.c b/shlibs/blkid/src/superblocks/ntfs.c
index 98f3fb2..3b9f987 100644
--- a/shlibs/blkid/src/superblocks/ntfs.c
+++ b/shlibs/blkid/src/superblocks/ntfs.c
@@ -166,7 +166,7 @@ const struct blkid_idinfo ntfs_idinfo =
.magics =
{
{ .magic = "NTFS ", .len = 8, .sboff = 3 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/ocfs.c b/shlibs/blkid/src/superblocks/ocfs.c
index 9dbf41b..0040a81 100644
--- a/shlibs/blkid/src/superblocks/ocfs.c
+++ b/shlibs/blkid/src/superblocks/ocfs.c
@@ -178,7 +178,7 @@ const struct blkid_idinfo ocfs_idinfo =
.magics =
{
{ .magic = "OracleCFS", .len = 9, .kboff = 8 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -194,7 +194,7 @@ const struct blkid_idinfo ocfs2_idinfo =
{ .magic = "OCFSV2", .len = 6, .kboff = 2 },
{ .magic = "OCFSV2", .len = 6, .kboff = 4 },
{ .magic = "OCFSV2", .len = 6, .kboff = 8 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -207,7 +207,7 @@ const struct blkid_idinfo oracleasm_idinfo =
.magics =
{
{ .magic = "ORCLDISK", .len = 8, .sboff = 32 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/reiserfs.c b/shlibs/blkid/src/superblocks/reiserfs.c
index 921f523..45c29dc 100644
--- a/shlibs/blkid/src/superblocks/reiserfs.c
+++ b/shlibs/blkid/src/superblocks/reiserfs.c
@@ -106,7 +106,7 @@ const struct blkid_idinfo reiser_idinfo =
{ .magic = "ReIsEr3Fs", .len = 9, .kboff = 64, .sboff = 0x34 },
{ .magic = "ReIsErFs", .len = 8, .kboff = 64, .sboff = 0x34 },
{ .magic = "ReIsErFs", .len = 8, .kboff = 8, .sboff = 20 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -119,7 +119,7 @@ const struct blkid_idinfo reiser4_idinfo =
.magics =
{
{ .magic = "ReIsEr4", .len = 7, .kboff = 64 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/romfs.c b/shlibs/blkid/src/superblocks/romfs.c
index 91ef996..a4fba9a 100644
--- a/shlibs/blkid/src/superblocks/romfs.c
+++ b/shlibs/blkid/src/superblocks/romfs.c
@@ -45,7 +45,7 @@ const struct blkid_idinfo romfs_idinfo =
.magics =
{
{ .magic = "-rom1fs-", .len = 8 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/squashfs.c b/shlibs/blkid/src/superblocks/squashfs.c
index 45f1029..ccee8b9 100644
--- a/shlibs/blkid/src/superblocks/squashfs.c
+++ b/shlibs/blkid/src/superblocks/squashfs.c
@@ -61,7 +61,7 @@ const struct blkid_idinfo squashfs_idinfo =
/* LZMA version */
{ .magic = "qshs", .len = 4 },
{ .magic = "shsq", .len = 4 }, /* swap */
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h
index a79d7cb..d83e845 100644
--- a/shlibs/blkid/src/superblocks/superblocks.h
+++ b/shlibs/blkid/src/superblocks/superblocks.h
@@ -7,6 +7,8 @@
#ifndef _BLKID_SUPERBLOCKS_H
#define _BLKID_SUPERBLOCKS_H
+#define END_MAGIC_ARRAY NULL, 0, 0, 0
+
#include "blkidP.h"
extern const struct blkid_idinfo cramfs_idinfo;
diff --git a/shlibs/blkid/src/superblocks/swap.c b/shlibs/blkid/src/superblocks/swap.c
index 325a8fa..a4767d3 100644
--- a/shlibs/blkid/src/superblocks/swap.c
+++ b/shlibs/blkid/src/superblocks/swap.c
@@ -126,7 +126,7 @@ const struct blkid_idinfo swap_idinfo =
{ "SWAPSPACE2", 10, 0, 0x7ff6 },
{ "SWAP-SPACE", 10, 0, 0xfff6 },
{ "SWAPSPACE2", 10, 0, 0xfff6 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -165,7 +165,7 @@ const struct blkid_idinfo swsuspend_idinfo =
{ "ULSUSPEND", 9, 0, 0xfff6 },
{ "LINHIB0001",10,0, 0xfff6 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/sysv.c b/shlibs/blkid/src/superblocks/sysv.c
index 00c8c97..2d63d4a 100644
--- a/shlibs/blkid/src/superblocks/sysv.c
+++ b/shlibs/blkid/src/superblocks/sysv.c
@@ -135,7 +135,7 @@ const struct blkid_idinfo xenix_idinfo =
{
{ .magic = "\x2b\x55\x44", .len = 3, .kboff = 1, .sboff = 0x400 },
{ .magic = "\x44\x55\x2b", .len = 3, .kboff = 1, .sboff = 0x400 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/ubifs.c b/shlibs/blkid/src/superblocks/ubifs.c
index 87d94ba..a71eb39 100644
--- a/shlibs/blkid/src/superblocks/ubifs.c
+++ b/shlibs/blkid/src/superblocks/ubifs.c
@@ -116,6 +116,6 @@ const struct blkid_idinfo ubifs_idinfo =
.magics =
{
{ .magic = "\x31\x18\x10\x06", .len = 4 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/udf.c b/shlibs/blkid/src/superblocks/udf.c
index 78ddda6..a2387d0 100644
--- a/shlibs/blkid/src/superblocks/udf.c
+++ b/shlibs/blkid/src/superblocks/udf.c
@@ -161,6 +161,6 @@ const struct blkid_idinfo udf_idinfo =
{ .magic = "NSR02", .len = 5, .kboff = 32, .sboff = 1 },
{ .magic = "NSR03", .len = 5, .kboff = 32, .sboff = 1 },
{ .magic = "TEA01", .len = 5, .kboff = 32, .sboff = 1 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/vfat.c b/shlibs/blkid/src/superblocks/vfat.c
index 60191b9..3bd5bbf 100644
--- a/shlibs/blkid/src/superblocks/vfat.c
+++ b/shlibs/blkid/src/superblocks/vfat.c
@@ -419,7 +419,7 @@ const struct blkid_idinfo vfat_idinfo =
{ .magic = "\353", .len = 1, },
{ .magic = "\351", .len = 1, },
{ .magic = "\125\252", .len = 2, .sboff = 0x1fe },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/vmfs.c b/shlibs/blkid/src/superblocks/vmfs.c
index ead09a8..aebcb28 100644
--- a/shlibs/blkid/src/superblocks/vmfs.c
+++ b/shlibs/blkid/src/superblocks/vmfs.c
@@ -84,7 +84,7 @@ const struct blkid_idinfo vmfs_fs_idinfo =
.magics =
{
{ .magic = "\x5e\xf1\xab\x2f", .len = 4, .kboff = 2048 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
@@ -96,6 +96,6 @@ const struct blkid_idinfo vmfs_volume_idinfo =
.magics =
{
{ .magic = "\x0d\xd0\x01\xc0", .len = 4, .kboff = 1024 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/vxfs.c b/shlibs/blkid/src/superblocks/vxfs.c
index fdab85a..3342e45 100644
--- a/shlibs/blkid/src/superblocks/vxfs.c
+++ b/shlibs/blkid/src/superblocks/vxfs.c
@@ -35,7 +35,7 @@ const struct blkid_idinfo vxfs_idinfo =
.magics =
{
{ .magic = "\365\374\001\245", .len = 4, .kboff = 1 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
diff --git a/shlibs/blkid/src/superblocks/xfs.c b/shlibs/blkid/src/superblocks/xfs.c
index 1399fe1..09a23da 100644
--- a/shlibs/blkid/src/superblocks/xfs.c
+++ b/shlibs/blkid/src/superblocks/xfs.c
@@ -57,7 +57,7 @@ const struct blkid_idinfo xfs_idinfo =
.magics =
{
{ .magic = "XFSB", .len = 4 },
- { NULL }
+ { END_MAGIC_ARRAY }
}
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
