Merge branch 'libblkid/const' of https://github.com/t-8ch/util-linux

* 'libblkid/const' of https://github.com/t-8ch/util-linux:
  libblkid: constify return values of blkid_probe_get_sb
  include/c.h: handle members of const struct

diff --git a/include/c.h b/include/c.h
index 36eb2a9e7f80045588164f4cc4ef3f8a90f72321..e353643fdd88998f3332165663e7ed03b3e26268 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -215,7 +215,7 @@
 
 #define read_unaligned_member(p, m) __extension__ ({          \
        size_t offset = offsetof(__typeof__(* p), m);         \
-       __typeof__(p->m) v;                                   \
+       __typeof__(p->m + 0) v;                               \
        memcpy(&v, ((unsigned char *)p) + offset, sizeof(v)); \
        v; })
 

diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index cb263ef65f1c8881312d5b16e0cdc1f5815bad61..ea7d81b0c590cad694a2ff5f7b0c5cd040d8baf4 100644 (file)
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -441,7 +441,7 @@ extern void blkid_probe_prune_buffers(blkid_probe pr);
 /* returns superblock according to 'struct blkid_idmag' */
 extern const unsigned char *blkid_probe_get_sb_buffer(blkid_probe pr, const struct blkid_idmag *mag, size_t size);
 #define blkid_probe_get_sb(_pr, _mag, type) \
-                       ((type *) blkid_probe_get_sb_buffer((_pr), _mag, sizeof(type)))
+                       ((const type *) blkid_probe_get_sb_buffer((_pr), _mag, sizeof(type)))
 
 extern uint64_t blkid_probe_get_idmag_off(blkid_probe pr, const struct blkid_idmag *mag)
                        __attribute__((nonnull));

diff --git a/libblkid/src/superblocks/apfs.c b/libblkid/src/superblocks/apfs.c
index 048423a8b3e5fbf1556b4295108491a6edf5308e..b7f09f334e310457d3031212f83ffb223f7e926b 100644 (file)
--- a/libblkid/src/superblocks/apfs.c
+++ b/libblkid/src/superblocks/apfs.c
@@ -39,7 +39,7 @@ struct apfs_super_block {
 
 static int probe_apfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct apfs_super_block *sb;
+       const struct apfs_super_block *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct apfs_super_block);
        if (!sb)

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 550dc9ba8af5d65f0bc2a7769f046fda66925624..47d906063db4d2e860556b95a5efa5e760641411 100644 (file)
--- a/libblkid/src/superblocks/bcache.c
+++ b/libblkid/src/superblocks/bcache.c
@@ -199,7 +199,7 @@ static int bcache_verify_checksum(blkid_probe pr, const struct blkid_idmag *mag,
 
 static int probe_bcache (blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct bcache_super_block *bcs;
+       const struct bcache_super_block *bcs;
 
        bcs = blkid_probe_get_sb(pr, mag, struct bcache_super_block);
        if (!bcs)
@@ -342,7 +342,7 @@ static int bcachefs_validate_checksum(blkid_probe pr, const struct bcachefs_supe
 
 static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct bcachefs_super_block *bcs;
+       const struct bcachefs_super_block *bcs;
        const unsigned char *sb, *sb_end;
        uint64_t sb_size, blocksize, offset_sectors;
        uint16_t version;

diff --git a/libblkid/src/superblocks/bluestore.c b/libblkid/src/superblocks/bluestore.c
index 2ff1f35182e0df9949a7da74bd81169f2f5903c3..f9178d9605f978a0c0013ff941c98d4f1e70f045 100644 (file)
--- a/libblkid/src/superblocks/bluestore.c
+++ b/libblkid/src/superblocks/bluestore.c
@@ -31,7 +31,7 @@ struct bluestore_phdr {
 
 static int probe_bluestore(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct bluestore_phdr *header;
+       const struct bluestore_phdr *header;
 
        header = blkid_probe_get_sb(pr, mag, struct bluestore_phdr);
        if (header == NULL)

diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index b9cf4bd3706b88a6b8e266b5e41b092d2c71339c..114d348ab40de6e8326861de268c898c7fc57dbf 100644 (file)
--- a/libblkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
@@ -250,7 +250,7 @@ static int btrfs_verify_csum(blkid_probe pr, const struct btrfs_super_block *bfs
 
 static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct btrfs_super_block *bfs;
+       const struct btrfs_super_block *bfs;
 
        if (pr->zone_size) {
 #ifdef HAVE_LINUX_BLKZONED_H

diff --git a/libblkid/src/superblocks/cramfs.c b/libblkid/src/superblocks/cramfs.c
index 5acec634b5122fb523723856f06327f1c552105e..6a8731f7bf714ec7d8eccbe5d8fd385ff8fbd8e3 100644 (file)
--- a/libblkid/src/superblocks/cramfs.c
+++ b/libblkid/src/superblocks/cramfs.c
@@ -46,7 +46,7 @@ static uint32_t cfs32_to_cpu(int le, uint32_t value)
 }
 
 static int cramfs_verify_csum(blkid_probe pr, const struct blkid_idmag *mag,
-               struct cramfs_super *cs, int le)
+               const struct cramfs_super *cs, int le)
 {
        uint32_t crc, expected, csummed_size;
        const unsigned char *csummed;
@@ -71,7 +71,7 @@ static int cramfs_verify_csum(blkid_probe pr, const struct blkid_idmag *mag,
 
 static int probe_cramfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct cramfs_super *cs;
+       const struct cramfs_super *cs;
 
        cs = blkid_probe_get_sb(pr, mag, struct cramfs_super);
        if (!cs)

diff --git a/libblkid/src/superblocks/cs_fvault2.c b/libblkid/src/superblocks/cs_fvault2.c
index ef2b567c46c32ff9c1ccbc0e812a7f083b86fab5..187258d5dd12e4233703be167eb7be75dc328db2 100644 (file)
--- a/libblkid/src/superblocks/cs_fvault2.c
+++ b/libblkid/src/superblocks/cs_fvault2.c
@@ -65,7 +65,7 @@ static int cs_fvault2_verify_csum(blkid_probe pr, const struct cs_fvault2_sb *sb
 
 static int probe_cs_fvault2(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct cs_fvault2_sb *sb;
+       const struct cs_fvault2_sb *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct cs_fvault2_sb);
        if (!sb)

diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index baead1d78a3c428a2cd9568f24ba68909788d2ee..7f72eb13f3d0cb68eb674ff0a0fc4ffcd69dbeb0 100644 (file)
--- a/libblkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
@@ -126,7 +126,7 @@ struct meta_data_on_disk_9 {
 
 static int probe_drbd_84(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct md_on_disk_08 *md;
+       const struct md_on_disk_08 *md;
 
        md = blkid_probe_get_sb(pr, mag, struct md_on_disk_08);
        if (!md)
@@ -147,7 +147,7 @@ static int probe_drbd_84(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_drbd_90(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct meta_data_on_disk_9 *md;
+       const struct meta_data_on_disk_9 *md;
 
        md = blkid_probe_get_sb(pr, mag, struct meta_data_on_disk_9);
        if (!md)

diff --git a/libblkid/src/superblocks/erofs.c b/libblkid/src/superblocks/erofs.c
index 672cd7fdc020eb1767d6248955cf3c5950b77b83..05822460be6152334f6f4c12b0e5bd6af1597c38 100644 (file)
--- a/libblkid/src/superblocks/erofs.c
+++ b/libblkid/src/superblocks/erofs.c
@@ -67,7 +67,7 @@ static int erofs_verify_checksum(blkid_probe pr, const struct blkid_idmag *mag,
 
 static int probe_erofs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct erofs_super_block *sb;
+       const struct erofs_super_block *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct erofs_super_block);
        if (!sb)

diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index 06ad5c8c02876a8c41a7003cf24b639bbfee6a27..18a3e07c7a2a5f74a4b8e8aebb9c6d0b9ee1c098 100644 (file)
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -191,7 +191,7 @@ extern int blkid_probe_is_exfat(blkid_probe pr);
  */
 int blkid_probe_is_exfat(blkid_probe pr)
 {
-       struct exfat_super_block *sb;
+       const struct exfat_super_block *sb;
        const struct blkid_idmag *mag = NULL;
        int rc;
 
@@ -213,7 +213,7 @@ int blkid_probe_is_exfat(blkid_probe pr)
 
 static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct exfat_super_block *sb;
+       const struct exfat_super_block *sb;
        struct exfat_entry_label *label;
 
        sb = blkid_probe_get_sb(pr, mag, struct exfat_super_block);

diff --git a/libblkid/src/superblocks/exfs.c b/libblkid/src/superblocks/exfs.c
index 87dc0a0c738c59fe38208c1aecafd423dde1eee2..0a169bdea81f0b63c1c50ae84b66f8e8d9aa7931 100644 (file)
--- a/libblkid/src/superblocks/exfs.c
+++ b/libblkid/src/superblocks/exfs.c
@@ -85,7 +85,7 @@ struct exfs_super_block {
                         (s)->sb_agblocks + EXFS_MIN_AG_BLOCKS)
 
 
-static void sb_from_disk(struct exfs_super_block *from,
+static void sb_from_disk(const struct exfs_super_block *from,
                         struct exfs_super_block *to)
 {
 
@@ -121,7 +121,7 @@ static void sb_from_disk(struct exfs_super_block *from,
        to->sb_frextents = be64_to_cpu(from->sb_frextents);
 }
 
-static int exfs_verify_sb(struct exfs_super_block *ondisk)
+static int exfs_verify_sb(const struct exfs_super_block *ondisk)
 {
        struct exfs_super_block sb, *sbp = &sb;
 
@@ -158,7 +158,7 @@ static int exfs_verify_sb(struct exfs_super_block *ondisk)
 
 static int probe_exfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct exfs_super_block *xs;
+       const struct exfs_super_block *xs;
 
        xs = blkid_probe_get_sb(pr, mag, struct exfs_super_block);
        if (!xs)

diff --git a/libblkid/src/superblocks/f2fs.c b/libblkid/src/superblocks/f2fs.c
index 5ee3442fc895022d8a87b23d08e540eb405047fd..4e0fdbfe30549d63b63b30570198f91ea53f0ec4 100644 (file)
--- a/libblkid/src/superblocks/f2fs.c
+++ b/libblkid/src/superblocks/f2fs.c
@@ -85,7 +85,7 @@ static int f2fs_validate_checksum(blkid_probe pr, size_t sb_off,
 
 static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct f2fs_super_block *sb;
+       const struct f2fs_super_block *sb;
        uint16_t vermaj, vermin;
 
        sb = blkid_probe_get_sb(pr, mag, struct f2fs_super_block);

diff --git a/libblkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c
index 445c0dafa3285baa926b02dc8f2acf8b095d797d..18d978aa28c1e36e7b7e90ef42833f574e3589e7 100644 (file)
--- a/libblkid/src/superblocks/gfs.c
+++ b/libblkid/src/superblocks/gfs.c
@@ -59,7 +59,7 @@ struct gfs2_sb {
 
 static int probe_gfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct gfs2_sb *sbd;
+       const struct gfs2_sb *sbd;
 
        sbd = blkid_probe_get_sb(pr, mag, struct gfs2_sb);
        if (!sbd)
@@ -91,7 +91,7 @@ static inline int gfs2_multiformat_is_valid(uint32_t multi)
 
 static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct gfs2_sb *sbd;
+       const struct gfs2_sb *sbd;
 
        sbd = blkid_probe_get_sb(pr, mag, struct gfs2_sb);
        if (!sbd)

diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
index 5066827c0f5a21cc67381dea8950f209bc5f4853..49a0e609327338c50a1578f6aea0fb34fcc88b95 100644 (file)
--- a/libblkid/src/superblocks/hfs.c
+++ b/libblkid/src/superblocks/hfs.c
@@ -154,7 +154,7 @@ static int hfs_set_uuid(blkid_probe pr, unsigned char const *hfs_info, size_t le
 
 static int probe_hfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct hfs_mdb  *hfs;
+       const struct hfs_mdb    *hfs;
        int size;
 
        hfs = blkid_probe_get_sb(pr, mag, struct hfs_mdb);

diff --git a/libblkid/src/superblocks/hpfs.c b/libblkid/src/superblocks/hpfs.c
index 09bf975eabb4400f9c0d81dd6934b1a510eff78c..f7ee02d50a46a6f9a94595b33db293195021a0a3 100644 (file)
--- a/libblkid/src/superblocks/hpfs.c
+++ b/libblkid/src/superblocks/hpfs.c
@@ -60,9 +60,9 @@ struct hpfs_spare_super
 
 static int probe_hpfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct hpfs_super_block *hs;
-       struct hpfs_spare_super *hss;
-       struct hpfs_boot_block *hbb;
+       const struct hpfs_super_block *hs;
+       const struct hpfs_spare_super *hss;
+       const struct hpfs_boot_block *hbb;
        uint8_t version;
 
        /* super block */

diff --git a/libblkid/src/superblocks/jfs.c b/libblkid/src/superblocks/jfs.c
index 7b75ecb6b57520210ac544c534125781781df123..c2773751cdd2ce2160d49d4508ceba5660f7e672 100644 (file)
--- a/libblkid/src/superblocks/jfs.c
+++ b/libblkid/src/superblocks/jfs.c
@@ -36,7 +36,7 @@ struct jfs_super_block {
 
 static int probe_jfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct jfs_super_block *js;
+       const struct jfs_super_block *js;
 
        js = blkid_probe_get_sb(pr, mag, struct jfs_super_block);
        if (!js)

diff --git a/libblkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c
index fdd9cd6d7af9664c2043897885ceedee8f018c11..0a3d505b705f066c7bbd7654f1fae1375eb5097d 100644 (file)
--- a/libblkid/src/superblocks/lvm.c
+++ b/libblkid/src/superblocks/lvm.c
@@ -122,7 +122,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_lvm1(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct lvm1_pv_label_header *label;
+       const struct lvm1_pv_label_header *label;
        char uuid[LVM2_ID_LEN + 7];
        unsigned int version;
 
@@ -158,7 +158,7 @@ struct verity_sb {
 
 static int probe_verity(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct verity_sb *sb;
+       const struct verity_sb *sb;
        unsigned int version;
 
        sb = blkid_probe_get_sb(pr, mag, struct verity_sb);
@@ -187,7 +187,7 @@ struct integrity_sb {
 
 static int probe_integrity(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct integrity_sb *sb;
+       const struct integrity_sb *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct integrity_sb);
        if (sb == NULL)

diff --git a/libblkid/src/superblocks/mpool.c b/libblkid/src/superblocks/mpool.c
index b27569ef3a05239a2b0277777bce34407d54024b..8a2e29c3ae96009d30bb09477e5dee4a63ac22f9 100644 (file)
--- a/libblkid/src/superblocks/mpool.c
+++ b/libblkid/src/superblocks/mpool.c
@@ -26,7 +26,7 @@ struct omf_sb_descriptor {
 
 static int probe_mpool(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct omf_sb_descriptor *osd;
+       const struct omf_sb_descriptor *osd;
        uint32_t sb_crc;
 
        osd = blkid_probe_get_sb(pr, mag, struct omf_sb_descriptor);

diff --git a/libblkid/src/superblocks/netware.c b/libblkid/src/superblocks/netware.c
index af81cf5fd350e6327be061e949dcaba31ef44b79..a8c20cb663d322a1ccf284b4d853e1f7abbfc5e4 100644 (file)
--- a/libblkid/src/superblocks/netware.c
+++ b/libblkid/src/superblocks/netware.c
@@ -67,7 +67,7 @@ struct netware_super_block {
 
 static int probe_netware(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct netware_super_block *nw;
+       const struct netware_super_block *nw;
 
        nw = blkid_probe_get_sb(pr, mag, struct netware_super_block);
        if (!nw)

diff --git a/libblkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c
index 14f74d3916e8d7db593d08996f0f579a12a49b6d..f2b2ca21459e1355420a455af42cc804f236663b 100644 (file)
--- a/libblkid/src/superblocks/ocfs.c
+++ b/libblkid/src/superblocks/ocfs.c
@@ -142,7 +142,7 @@ static int probe_ocfs(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_ocfs2(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct ocfs2_super_block *osb;
+       const struct ocfs2_super_block *osb;
 
        osb = blkid_probe_get_sb(pr, mag, struct ocfs2_super_block);
        if (!osb)
@@ -165,7 +165,7 @@ static int probe_ocfs2(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_oracleasm(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct oracle_asm_disk_label *dl;
+       const struct oracle_asm_disk_label *dl;
 
        dl = blkid_probe_get_sb(pr, mag, struct oracle_asm_disk_label);
        if (!dl)

diff --git a/libblkid/src/superblocks/reiserfs.c b/libblkid/src/superblocks/reiserfs.c
index 23d10e2e275288759190ab7e9480903cb0ba5ce5..dac5f0ce8ffdc90614d7d90f3b1c7d5c8db0517f 100644 (file)
--- a/libblkid/src/superblocks/reiserfs.c
+++ b/libblkid/src/superblocks/reiserfs.c
@@ -41,7 +41,7 @@ struct reiser4_super_block {
 
 static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct reiserfs_super_block *rs;
+       const struct reiserfs_super_block *rs;
        unsigned int blocksize;
 
        rs = blkid_probe_get_sb(pr, mag, struct reiserfs_super_block);
@@ -82,7 +82,7 @@ static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct reiser4_super_block *rs4;
+       const struct reiser4_super_block *rs4;
        unsigned int blocksize;
 
        rs4 = blkid_probe_get_sb(pr, mag, struct reiser4_super_block);

diff --git a/libblkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c
index 805e8fc1ed851829e48923513c4aecbd9ff9c1ca..86c09adc359f9c16b6d778611072473d60229b79 100644 (file)
--- a/libblkid/src/superblocks/romfs.c
+++ b/libblkid/src/superblocks/romfs.c
@@ -50,7 +50,7 @@ static int romfs_verify_csum(blkid_probe pr, const struct blkid_idmag *mag,
 
 static int probe_romfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct romfs_super_block *ros;
+       const struct romfs_super_block *ros;
 
        ros = blkid_probe_get_sb(pr, mag, struct romfs_super_block);
        if (!ros)

diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
index 9543c46ccac287a3189e394d5874f0343df3465b..8246583e837958e52106ce6f46141ad73c6e3061 100644 (file)
--- a/libblkid/src/superblocks/squashfs.c
+++ b/libblkid/src/superblocks/squashfs.c
@@ -40,7 +40,7 @@ struct sqsh_super_block {
 
 static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct sqsh_super_block *sq;
+       const struct sqsh_super_block *sq;
        uint16_t vermaj;
        uint16_t vermin;
 
@@ -63,7 +63,7 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct sqsh_super_block *sq;
+       const struct sqsh_super_block *sq;
        uint16_t vermaj;
        uint16_t vermin;
        enum blkid_endianness endianness;

diff --git a/libblkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c
index 421660e556a2b7c129ab57c8a731c096ababa4de..a9085c44cc8cef488a2dae4d56b8a8e190353c60 100644 (file)
--- a/libblkid/src/superblocks/sysv.c
+++ b/libblkid/src/superblocks/sysv.c
@@ -76,7 +76,7 @@ struct sysv_super_block
 
 static int probe_xenix(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct xenix_super_block *sb;
+       const struct xenix_super_block *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct xenix_super_block);
        if (!sb)

diff --git a/libblkid/src/superblocks/ubi.c b/libblkid/src/superblocks/ubi.c
index fbb7c5e33bb9806b4b741b4474742bbb07f5700d..b15199bd4981632aa088c23dae99573d9cc5b7fb 100644 (file)
--- a/libblkid/src/superblocks/ubi.c
+++ b/libblkid/src/superblocks/ubi.c
@@ -35,7 +35,7 @@ static int ubi_verify_csum(blkid_probe pr, const struct ubi_ec_hdr *hdr)
 
 static int probe_ubi(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct ubi_ec_hdr *hdr;
+       const struct ubi_ec_hdr *hdr;
 
        hdr = blkid_probe_get_sb(pr, mag, struct ubi_ec_hdr);
        if (!hdr)

diff --git a/libblkid/src/superblocks/ubifs.c b/libblkid/src/superblocks/ubifs.c
index 8dece286ec1612e74fe9c94f17611158235d691e..c9733a97c3beb25058c3809bcff43cfa9027c071 100644 (file)
--- a/libblkid/src/superblocks/ubifs.c
+++ b/libblkid/src/superblocks/ubifs.c
@@ -105,7 +105,7 @@ static int ubifs_verify_csum(blkid_probe pr, const struct ubifs_sb_node *sb)
 
 static int probe_ubifs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct ubifs_sb_node *sb;
+       const struct ubifs_sb_node *sb;
 
        sb = blkid_probe_get_sb(pr, mag, struct ubifs_sb_node);
        if (!sb)

diff --git a/libblkid/src/superblocks/vdo.c b/libblkid/src/superblocks/vdo.c
index bec686f4f20b904df718150e3712358612053eb7..4e9f445cd48b88eb1b99f1d52ea7283b9b6eb2a4 100644 (file)
--- a/libblkid/src/superblocks/vdo.c
+++ b/libblkid/src/superblocks/vdo.c
@@ -25,7 +25,7 @@ struct vdo_super_block {
 
 static int probe_vdo(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct vdo_super_block *vsb;
+       const struct vdo_super_block *vsb;
 
        vsb = blkid_probe_get_sb(pr, mag, struct vdo_super_block);
        if (!vsb)

diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
index 94edbc1fd7306c9d385892e321695179805cd8ea..5644d8992e4d9c8eff05637c9e15c50ee9ba185a 100644 (file)
--- a/libblkid/src/superblocks/vfat.c
+++ b/libblkid/src/superblocks/vfat.c
@@ -183,8 +183,8 @@ static int search_fat_label(blkid_probe pr, uint64_t offset, uint32_t entries, u
 
 static int fat_valid_superblock(blkid_probe pr,
                        const struct blkid_idmag *mag,
-                       struct msdos_super_block *ms,
-                       struct vfat_super_block *vs,
+                       const struct msdos_super_block *ms,
+                       const struct vfat_super_block *vs,
                        uint32_t *cluster_count, uint32_t *fat_size,
                        uint32_t *sect_count)
 {
@@ -276,8 +276,8 @@ extern int blkid_probe_is_vfat(blkid_probe pr);
  */
 int blkid_probe_is_vfat(blkid_probe pr)
 {
-       struct vfat_super_block *vs;
-       struct msdos_super_block *ms;
+       const struct vfat_super_block *vs;
+       const struct msdos_super_block *ms;
        const struct blkid_idmag *mag = NULL;
        int rc;
 
@@ -301,11 +301,12 @@ int blkid_probe_is_vfat(blkid_probe pr)
  * Sievers's volume_id library */
 static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct vfat_super_block *vs;
-       struct msdos_super_block *ms;
+       const struct vfat_super_block *vs;
+       const struct msdos_super_block *ms;
        const unsigned char *vol_label = NULL;
        const unsigned char *boot_label = NULL;
-       unsigned char *vol_serno = NULL, vol_label_buf[11];
+       const unsigned char *vol_serno = NULL;
+       unsigned char vol_label_buf[11];
        uint16_t sector_size = 0, reserved;
        uint32_t cluster_count, fat_size, sect_count;
        const char *version = NULL;

diff --git a/libblkid/src/superblocks/vmfs.c b/libblkid/src/superblocks/vmfs.c
index ff96136c82c7a02d668dc78710e764bda6df88e1..3017768c2554121eda6dce455f4eb05c516d2f98 100644 (file)
--- a/libblkid/src/superblocks/vmfs.c
+++ b/libblkid/src/superblocks/vmfs.c
@@ -24,7 +24,7 @@ struct vmfs_volume_info {
 
 static int probe_vmfs_fs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct vmfs_fs_info *header;
+       const struct vmfs_fs_info *header;
 
        header = blkid_probe_get_sb(pr, mag, struct vmfs_fs_info);
        if (header == NULL)
@@ -48,7 +48,7 @@ static int probe_vmfs_fs(blkid_probe pr, const struct blkid_idmag *mag)
 
 static int probe_vmfs_volume(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct vmfs_volume_info *header;
+       const struct vmfs_volume_info *header;
        const unsigned char *lvm_uuid;
 
        header = blkid_probe_get_sb(pr, mag, struct vmfs_volume_info);

diff --git a/libblkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c
index 950bc09cf8a916f56a6a4273d724a0fd9fd0616e..c933861cfb55cf0387ba1dac2750affe6a2c95ce 100644 (file)
--- a/libblkid/src/superblocks/vxfs.c
+++ b/libblkid/src/superblocks/vxfs.c
@@ -25,7 +25,7 @@ struct vxfs_super_block {
 
 static int probe_vxfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct vxfs_super_block *vxs;
+       const struct vxfs_super_block *vxs;
        enum blkid_endianness e = mag->hint;
 
        vxs = blkid_probe_get_sb(pr, mag, struct vxfs_super_block);

diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index a592469fd91bcdc4fe90162e819e59c2a9bd05f1..0c3598227444f00baef677979823438b0ecc9812 100644 (file)
--- a/libblkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
@@ -111,7 +111,7 @@ struct xfs_super_block {
 #define XFS_SB_VERSION2_CRCBIT         0x00000100
 
 
-static void sb_from_disk(struct xfs_super_block *from,
+static void sb_from_disk(const struct xfs_super_block *from,
                         struct xfs_super_block *to)
 {
 
@@ -170,7 +170,7 @@ static void sb_from_disk(struct xfs_super_block *from,
        to->sb_rrmapino = be64_to_cpu(from->sb_rrmapino);
 }
 
-static int xfs_verify_sb(struct xfs_super_block *ondisk, blkid_probe pr,
+static int xfs_verify_sb(const struct xfs_super_block *ondisk, blkid_probe pr,
                const struct blkid_idmag *mag)
 {
        struct xfs_super_block sb, *sbp = &sb;
@@ -230,7 +230,7 @@ static int xfs_verify_sb(struct xfs_super_block *ondisk, blkid_probe pr,
        return 1;
 }
 
-static uint64_t xfs_fssize(struct xfs_super_block *xs)
+static uint64_t xfs_fssize(const struct xfs_super_block *xs)
 {
        uint32_t lsize = xs->sb_logstart ? xs->sb_logblocks : 0;
        uint64_t avail_blocks = be64_to_cpu(xs->sb_dblocks) - be32_to_cpu(lsize);
@@ -241,7 +241,7 @@ static uint64_t xfs_fssize(struct xfs_super_block *xs)
 
 static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
-       struct xfs_super_block *xs;
+       const struct xfs_super_block *xs;
 
        xs = blkid_probe_get_sb(pr, mag, struct xfs_super_block);
        if (!xs)