diff options
37 files changed, 42 insertions, 40 deletions
diff --git a/shlibs/blkid/src/superblocks/adaptec_raid.c b/shlibs/blkid/src/superblocks/adaptec_raid.c index 5e8b3a758..03f44ad7b 100644 --- a/shlibs/blkid/src/superblocks/adaptec_raid.c +++ b/shlibs/blkid/src/superblocks/adaptec_raid.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct adaptec_metadata { uint32_t b0idcode; diff --git a/shlibs/blkid/src/superblocks/btrfs.c b/shlibs/blkid/src/superblocks/btrfs.c index 3205e3d97..a2019597b 100644 --- a/shlibs/blkid/src/superblocks/btrfs.c +++ b/shlibs/blkid/src/superblocks/btrfs.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct btrfs_super_block { uint8_t csum[32]; diff --git a/shlibs/blkid/src/superblocks/cramfs.c b/shlibs/blkid/src/superblocks/cramfs.c index 0ea124b30..8a70f80bf 100644 --- a/shlibs/blkid/src/superblocks/cramfs.c +++ b/shlibs/blkid/src/superblocks/cramfs.c @@ -15,7 +15,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct cramfs_super { diff --git a/shlibs/blkid/src/superblocks/ddf_raid.c b/shlibs/blkid/src/superblocks/ddf_raid.c index 41d6e1235..89bd92c7a 100644 --- a/shlibs/blkid/src/superblocks/ddf_raid.c +++ b/shlibs/blkid/src/superblocks/ddf_raid.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" /* http://www.snia.org/standards/home */ #define DDF_GUID_LENGTH 24 diff --git a/shlibs/blkid/src/superblocks/ext.c b/shlibs/blkid/src/superblocks/ext.c index c27411d24..5b1900190 100644 --- a/shlibs/blkid/src/superblocks/ext.c +++ b/shlibs/blkid/src/superblocks/ext.c @@ -19,7 +19,7 @@ #include <time.h> #include "linux_version.h" -#include "blkidP.h" +#include "superblocks.h" struct ext2_super_block { uint32_t s_inodes_count; diff --git a/shlibs/blkid/src/superblocks/gfs.c b/shlibs/blkid/src/superblocks/gfs.c index 584561cf3..a7ff6615f 100644 --- a/shlibs/blkid/src/superblocks/gfs.c +++ b/shlibs/blkid/src/superblocks/gfs.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" /* Common gfs/gfs2 constants: */ #define GFS_LOCKNAME_LEN 64 diff --git a/shlibs/blkid/src/superblocks/hfs.c b/shlibs/blkid/src/superblocks/hfs.c index 4cdef0ee7..8ebff68da 100644 --- a/shlibs/blkid/src/superblocks/hfs.c +++ b/shlibs/blkid/src/superblocks/hfs.c @@ -11,7 +11,7 @@ #include <string.h> #include <inttypes.h> -#include "blkidP.h" +#include "superblocks.h" #include "md5.h" /* HFS / HFS+ */ diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c index c7c92db44..4b4b85117 100644 --- a/shlibs/blkid/src/superblocks/highpoint_raid.c +++ b/shlibs/blkid/src/superblocks/highpoint_raid.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct hpt45x_metadata { uint32_t magic; diff --git a/shlibs/blkid/src/superblocks/hpfs.c b/shlibs/blkid/src/superblocks/hpfs.c index 2f5f0d198..406c50aa4 100644 --- a/shlibs/blkid/src/superblocks/hpfs.c +++ b/shlibs/blkid/src/superblocks/hpfs.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct hpfs_boot_block { diff --git a/shlibs/blkid/src/superblocks/iso9660.c b/shlibs/blkid/src/superblocks/iso9660.c index ca53e3ae4..76e550b10 100644 --- a/shlibs/blkid/src/superblocks/iso9660.c +++ b/shlibs/blkid/src/superblocks/iso9660.c @@ -17,7 +17,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct iso_volume_descriptor { unsigned char vd_type; diff --git a/shlibs/blkid/src/superblocks/isw_raid.c b/shlibs/blkid/src/superblocks/isw_raid.c index f9ae7453f..0f4869fdc 100644 --- a/shlibs/blkid/src/superblocks/isw_raid.c +++ b/shlibs/blkid/src/superblocks/isw_raid.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct isw_metadata { uint8_t sig[32]; diff --git a/shlibs/blkid/src/superblocks/jfs.c b/shlibs/blkid/src/superblocks/jfs.c index 5d9b39acd..e6e445053 100644 --- a/shlibs/blkid/src/superblocks/jfs.c +++ b/shlibs/blkid/src/superblocks/jfs.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct jfs_super_block { unsigned char js_magic[4]; diff --git a/shlibs/blkid/src/superblocks/jmicron_raid.c b/shlibs/blkid/src/superblocks/jmicron_raid.c index ae852f8ff..70e0e1c60 100644 --- a/shlibs/blkid/src/superblocks/jmicron_raid.c +++ b/shlibs/blkid/src/superblocks/jmicron_raid.c @@ -14,7 +14,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct jm_metadata { int8_t signature[2]; diff --git a/shlibs/blkid/src/superblocks/linux_raid.c b/shlibs/blkid/src/superblocks/linux_raid.c index a5926561d..0fba63489 100644 --- a/shlibs/blkid/src/superblocks/linux_raid.c +++ b/shlibs/blkid/src/superblocks/linux_raid.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct mdp0_super_block { uint32_t md_magic; diff --git a/shlibs/blkid/src/superblocks/lsi_raid.c b/shlibs/blkid/src/superblocks/lsi_raid.c index d9ac4e12e..6baaaa477 100644 --- a/shlibs/blkid/src/superblocks/lsi_raid.c +++ b/shlibs/blkid/src/superblocks/lsi_raid.c @@ -14,7 +14,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct lsi_metadata { uint8_t sig[6]; diff --git a/shlibs/blkid/src/superblocks/luks.c b/shlibs/blkid/src/superblocks/luks.c index 2fe4ff3b4..486779d2b 100644 --- a/shlibs/blkid/src/superblocks/luks.c +++ b/shlibs/blkid/src/superblocks/luks.c @@ -15,7 +15,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" #define LUKS_CIPHERNAME_L 32 #define LUKS_CIPHERMODE_L 32 diff --git a/shlibs/blkid/src/superblocks/lvm.c b/shlibs/blkid/src/superblocks/lvm.c index d8edc37ab..facf703e9 100644 --- a/shlibs/blkid/src/superblocks/lvm.c +++ b/shlibs/blkid/src/superblocks/lvm.c @@ -14,7 +14,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" #define LVM1_ID_LEN 128 #define LVM2_ID_LEN 32 diff --git a/shlibs/blkid/src/superblocks/minix.c b/shlibs/blkid/src/superblocks/minix.c index b29b9a427..784f0758a 100644 --- a/shlibs/blkid/src/superblocks/minix.c +++ b/shlibs/blkid/src/superblocks/minix.c @@ -9,7 +9,7 @@ * GNU Lesser General Public License. */ -#include "blkidP.h" +#include "superblocks.h" static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag) { diff --git a/shlibs/blkid/src/superblocks/netware.c b/shlibs/blkid/src/superblocks/netware.c index 722506f87..7ef216254 100644 --- a/shlibs/blkid/src/superblocks/netware.c +++ b/shlibs/blkid/src/superblocks/netware.c @@ -13,7 +13,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct netware_super_block { uint8_t SBH_Signature[4]; diff --git a/shlibs/blkid/src/superblocks/ntfs.c b/shlibs/blkid/src/superblocks/ntfs.c index 55a186a38..21a2d8dd5 100644 --- a/shlibs/blkid/src/superblocks/ntfs.c +++ b/shlibs/blkid/src/superblocks/ntfs.c @@ -11,7 +11,7 @@ #include <string.h> #include <inttypes.h> -#include "blkidP.h" +#include "superblocks.h" struct ntfs_super_block { uint8_t jump[3]; diff --git a/shlibs/blkid/src/superblocks/nvidia_raid.c b/shlibs/blkid/src/superblocks/nvidia_raid.c index 76361763c..da989e078 100644 --- a/shlibs/blkid/src/superblocks/nvidia_raid.c +++ b/shlibs/blkid/src/superblocks/nvidia_raid.c @@ -14,7 +14,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct nv_metadata { uint8_t vendor[8]; diff --git a/shlibs/blkid/src/superblocks/ocfs.c b/shlibs/blkid/src/superblocks/ocfs.c index f9bd11aae..6e58b37a0 100644 --- a/shlibs/blkid/src/superblocks/ocfs.c +++ b/shlibs/blkid/src/superblocks/ocfs.c @@ -12,7 +12,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct ocfs_volume_header { unsigned char minor_version[4]; diff --git a/shlibs/blkid/src/superblocks/promise_raid.c b/shlibs/blkid/src/superblocks/promise_raid.c index 295400925..94a64469f 100644 --- a/shlibs/blkid/src/superblocks/promise_raid.c +++ b/shlibs/blkid/src/superblocks/promise_raid.c @@ -15,7 +15,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct promise_metadata { uint8_t sig[24]; diff --git a/shlibs/blkid/src/superblocks/reiserfs.c b/shlibs/blkid/src/superblocks/reiserfs.c index f9a46787e..341470ab8 100644 --- a/shlibs/blkid/src/superblocks/reiserfs.c +++ b/shlibs/blkid/src/superblocks/reiserfs.c @@ -12,7 +12,7 @@ #include <string.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct reiserfs_super_block { uint32_t rs_blocks_count; diff --git a/shlibs/blkid/src/superblocks/romfs.c b/shlibs/blkid/src/superblocks/romfs.c index b5c20ab7f..3b3237175 100644 --- a/shlibs/blkid/src/superblocks/romfs.c +++ b/shlibs/blkid/src/superblocks/romfs.c @@ -15,7 +15,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct romfs_super_block { unsigned char ros_magic[8]; diff --git a/shlibs/blkid/src/superblocks/silicon_raid.c b/shlibs/blkid/src/superblocks/silicon_raid.c index a65d79a83..08406b272 100644 --- a/shlibs/blkid/src/superblocks/silicon_raid.c +++ b/shlibs/blkid/src/superblocks/silicon_raid.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct silicon_metadata { uint8_t unknown0[0x2E]; diff --git a/shlibs/blkid/src/superblocks/squashfs.c b/shlibs/blkid/src/superblocks/squashfs.c index 74f53bfb6..04f9e71ce 100644 --- a/shlibs/blkid/src/superblocks/squashfs.c +++ b/shlibs/blkid/src/superblocks/squashfs.c @@ -14,7 +14,7 @@ #include <stdint.h> #include "bitops.h" /* swab16() */ -#include "blkidP.h" +#include "superblocks.h" struct sqsh_super_block { uint32_t s_magic; diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h index 78dbd4065..d8e32a130 100644 --- a/shlibs/blkid/src/superblocks/superblocks.h +++ b/shlibs/blkid/src/superblocks/superblocks.h @@ -1,11 +1,13 @@ /* - * Copyright (C) 2008 Karel Zak <kzak@redhat.com> + * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com> * * This file may be redistributed under the terms of the * GNU Lesser General Public License. */ -#ifndef _BLKID_PROBE_H -#define _BLKID_PROBE_H +#ifndef _BLKID_SUPERBLOCKS_H +#define _BLKID_SUPERBLOCKS_H + +#include "blkidP.h" extern const struct blkid_idinfo cramfs_idinfo; extern const struct blkid_idinfo swap_idinfo; @@ -58,4 +60,4 @@ extern const struct blkid_idinfo xenix_idinfo; extern const struct blkid_idinfo btrfs_idinfo; extern const struct blkid_idinfo zfs_idinfo; -#endif /* _BLKID_PROBE_H */ +#endif /* _BLKID_SUPERBLOCKS_H */ diff --git a/shlibs/blkid/src/superblocks/swap.c b/shlibs/blkid/src/superblocks/swap.c index c289488a1..5f7dd107a 100644 --- a/shlibs/blkid/src/superblocks/swap.c +++ b/shlibs/blkid/src/superblocks/swap.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" /* linux-2.6/include/linux/swap.h */ struct swap_header_v1_2 { diff --git a/shlibs/blkid/src/superblocks/sysv.c b/shlibs/blkid/src/superblocks/sysv.c index 933163a27..82e6a1fac 100644 --- a/shlibs/blkid/src/superblocks/sysv.c +++ b/shlibs/blkid/src/superblocks/sysv.c @@ -13,7 +13,7 @@ #include <unistd.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" #define XENIX_NICINOD 100 #define XENIX_NICFREE 100 diff --git a/shlibs/blkid/src/superblocks/udf.c b/shlibs/blkid/src/superblocks/udf.c index 5f4046d6d..3b972ee90 100644 --- a/shlibs/blkid/src/superblocks/udf.c +++ b/shlibs/blkid/src/superblocks/udf.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct volume_descriptor { struct descriptor_tag { diff --git a/shlibs/blkid/src/superblocks/ufs.c b/shlibs/blkid/src/superblocks/ufs.c index fe9870d84..664f024b0 100644 --- a/shlibs/blkid/src/superblocks/ufs.c +++ b/shlibs/blkid/src/superblocks/ufs.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct ufs_super_block { uint32_t fs_link; diff --git a/shlibs/blkid/src/superblocks/vfat.c b/shlibs/blkid/src/superblocks/vfat.c index a83175c0b..9c20ebd9a 100644 --- a/shlibs/blkid/src/superblocks/vfat.c +++ b/shlibs/blkid/src/superblocks/vfat.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" /* Yucky misaligned values */ struct vfat_super_block { diff --git a/shlibs/blkid/src/superblocks/via_raid.c b/shlibs/blkid/src/superblocks/via_raid.c index 22022fdd5..b2d4efc50 100644 --- a/shlibs/blkid/src/superblocks/via_raid.c +++ b/shlibs/blkid/src/superblocks/via_raid.c @@ -16,7 +16,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct via_metadata { uint16_t signature; diff --git a/shlibs/blkid/src/superblocks/vxfs.c b/shlibs/blkid/src/superblocks/vxfs.c index 7a27b6c9e..fdab85a72 100644 --- a/shlibs/blkid/src/superblocks/vxfs.c +++ b/shlibs/blkid/src/superblocks/vxfs.c @@ -7,7 +7,7 @@ #include <stdio.h> -#include "blkidP.h" +#include "superblocks.h" struct vxfs_super_block { uint32_t vs_magic; diff --git a/shlibs/blkid/src/superblocks/xfs.c b/shlibs/blkid/src/superblocks/xfs.c index fa7914e29..ee4e338d7 100644 --- a/shlibs/blkid/src/superblocks/xfs.c +++ b/shlibs/blkid/src/superblocks/xfs.c @@ -17,7 +17,7 @@ #include <ctype.h> #include <stdint.h> -#include "blkidP.h" +#include "superblocks.h" struct xfs_super_block { unsigned char xs_magic[4]; diff --git a/shlibs/blkid/src/superblocks/zfs.c b/shlibs/blkid/src/superblocks/zfs.c index 7d39034f6..02033af1f 100644 --- a/shlibs/blkid/src/superblocks/zfs.c +++ b/shlibs/blkid/src/superblocks/zfs.c @@ -13,7 +13,7 @@ #include <ctype.h> #include <inttypes.h> -#include "blkidP.h" +#include "superblocks.h" /* #include <sys/uberblock_impl.h> */ #define UBERBLOCK_MAGIC 0x00bab10c /* oo-ba-bloc! */ |