blkid: correctly initialize magics[] arrays

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/blkidP.h b/libs/blkid/src/blkidP.h
index acd10d4e63207a955f917d0065a5031312a25230..98fb7ff6704be7ff2224ee30ccbbaa3f009c85fc 100644 (file)
--- a/libs/blkid/src/blkidP.h
+++ b/libs/blkid/src/blkidP.h
@@ -136,6 +136,8 @@ struct blkid_idinfo
        struct blkid_idmag      magics[];       /* NULL or array with magic strings */
 };
 
+#define BLKID_NONE_MAGIC       {{ NULL }}
+
 /*
  * Minimum number of seconds between device probes, even when reading
  * from the cache.  This is to avoid re-probing all devices which were

diff --git a/libs/blkid/src/probers/adaptec_raid.c b/libs/blkid/src/probers/adaptec_raid.c
index 2bce73e6c6543b1a9af2143c5888f693466aada4..ccf56ddfbd1472ba81ef56472a6bd8d32d534b61 100644 (file)
--- a/libs/blkid/src/probers/adaptec_raid.c
+++ b/libs/blkid/src/probers/adaptec_raid.c
@@ -109,7 +109,8 @@ static int probe_adraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo adraid_idinfo = {
        .name           = "adaptec_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_adraid
+       .probefunc      = probe_adraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/ddf_raid.c b/libs/blkid/src/probers/ddf_raid.c
index 5c6f652219588f171923e49b52a7caf568d16b7f..894c73beddde8ad9171da113af906269e9082dc5 100644 (file)
--- a/libs/blkid/src/probers/ddf_raid.c
+++ b/libs/blkid/src/probers/ddf_raid.c
@@ -58,7 +58,8 @@ static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo ddfraid_idinfo = {
        .name           = "ddf_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_ddf
+       .probefunc      = probe_ddf,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/isw_raid.c b/libs/blkid/src/probers/isw_raid.c
index 968d5cb37da49f29abf6b3dea95822b9657acb5b..a08a45990d5115d8f0cf22740b67cf1aef77de1b 100644 (file)
--- a/libs/blkid/src/probers/isw_raid.c
+++ b/libs/blkid/src/probers/isw_raid.c
@@ -62,7 +62,8 @@ static int probe_iswraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo iswraid_idinfo = {
        .name           = "isw_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_iswraid
+       .probefunc      = probe_iswraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/jmicron_raid.c b/libs/blkid/src/probers/jmicron_raid.c
index 01fe60db088c47b126f373ae8e6ba31241f3970d..fb12077cad4941345dd44a5b21dc2875f9879dc9 100644 (file)
--- a/libs/blkid/src/probers/jmicron_raid.c
+++ b/libs/blkid/src/probers/jmicron_raid.c
@@ -60,7 +60,8 @@ static int probe_jmraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo jmraid_idinfo = {
        .name           = "jmicron_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_jmraid
+       .probefunc      = probe_jmraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/linux_raid.c b/libs/blkid/src/probers/linux_raid.c
index 41be8b76158c69e83a52c629099c5eb4c10f6ea0..163c770d728010229de5a5045bab5d32e3187f4e 100644 (file)
--- a/libs/blkid/src/probers/linux_raid.c
+++ b/libs/blkid/src/probers/linux_raid.c
@@ -159,7 +159,8 @@ int probe_raid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo linuxraid_idinfo = {
        .name           = "linux_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_raid
+       .probefunc      = probe_raid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/lsi_raid.c b/libs/blkid/src/probers/lsi_raid.c
index fe03dc5d9e69c647fe79e93b12cd9000b2d4e3f6..207ed84989e2771fb3c91e6f5a61b4aed23b5f2e 100644 (file)
--- a/libs/blkid/src/probers/lsi_raid.c
+++ b/libs/blkid/src/probers/lsi_raid.c
@@ -50,7 +50,8 @@ static int probe_lsiraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo lsiraid_idinfo = {
        .name           = "lsi_mega_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_lsiraid
+       .probefunc      = probe_lsiraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/nvidia_raid.c b/libs/blkid/src/probers/nvidia_raid.c
index cf03a0331ed2d945b72f5102855531ca892a2095..654fd7d022df8cd0a69ad558bfe1fab4fc7e5547 100644 (file)
--- a/libs/blkid/src/probers/nvidia_raid.c
+++ b/libs/blkid/src/probers/nvidia_raid.c
@@ -57,7 +57,8 @@ static int probe_nvraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo nvraid_idinfo = {
        .name           = "nvidia_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_nvraid
+       .probefunc      = probe_nvraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/promise_raid.c b/libs/blkid/src/probers/promise_raid.c
index c11ddd35e34d607612e1869ada5196bda9fa17f1..e3c1b63eccf2b880a3c72a5000b78c4ef748a8f2 100644 (file)
--- a/libs/blkid/src/probers/promise_raid.c
+++ b/libs/blkid/src/probers/promise_raid.c
@@ -60,7 +60,8 @@ static int probe_pdcraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo pdcraid_idinfo = {
        .name           = "promise_fasttrack_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_pdcraid
+       .probefunc      = probe_pdcraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/silicon_raid.c b/libs/blkid/src/probers/silicon_raid.c
index 1af920a83136bfd999e7c067dbc7b5000da20fc6..d800d67a6eedb578dc52b6289ab8848ae48c6f75 100644 (file)
--- a/libs/blkid/src/probers/silicon_raid.c
+++ b/libs/blkid/src/probers/silicon_raid.c
@@ -74,7 +74,8 @@ static int probe_silraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo silraid_idinfo = {
        .name           = "silicon_medley_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_silraid
+       .probefunc      = probe_silraid,
+       .magics         = BLKID_NONE_MAGIC
 };
 
 

diff --git a/libs/blkid/src/probers/via_raid.c b/libs/blkid/src/probers/via_raid.c
index 2a2557ca3baef6c69e3bcc6b69254d1060d06d7e..cb9058da4fd88cea1f9f11a191d139c1ee59b5c3 100644 (file)
--- a/libs/blkid/src/probers/via_raid.c
+++ b/libs/blkid/src/probers/via_raid.c
@@ -77,7 +77,8 @@ static int probe_viaraid(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo viaraid_idinfo = {
        .name           = "via_raid_member",
        .usage          = BLKID_USAGE_RAID,
-       .probefunc      = probe_viaraid
+       .probefunc      = probe_viaraid,
+       .magics         = BLKID_NONE_MAGIC
 };