libblkid: use superblocks.h

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

diff --git a/shlibs/blkid/src/superblocks/adaptec_raid.c b/shlibs/blkid/src/superblocks/adaptec_raid.c
index 5e8b3a758f7988b0b50f5504c8428dcfc85fafbe..03f44ad7b3d83a20530d3e3b76bd406cb0f93053 100644 (file)
--- 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 3205e3d977972dcdacec3ade0a065a5f3656452b..a2019597bbd8373670b3e2b8bc8a9b37b8a8b76d 100644 (file)
--- 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 0ea124b3047ab2a26e8bf64983496193b2d2a0cd..8a70f80bf3e2b6393b38388d92007d27538d16d4 100644 (file)
--- 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 41d6e12352105c036783eae0cfc8436c6737aa35..89bd92c7a00753d341d9fada9aa322196201f0de 100644 (file)
--- 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 c27411d2425da72f1b211ee73b72ace7b08a6767..5b190019082022e32eb9c8fd1f5a4351c4f1ac60 100644 (file)
--- 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 584561cf356b1021e404c02351ede3c03d59280a..a7ff6615f5a0dda769159ae65e37dfc037a1d8a3 100644 (file)
--- 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 4cdef0ee76163d06ed14d43e85691b8cacb5e00d..8ebff68da170405abf4eae51d17cea1242de76a5 100644 (file)
--- 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 c7c92db441cafe2e83f03c72934a3c218ba41837..4b4b851176c09a217e6005e13161851ae8faf7dd 100644 (file)
--- 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 2f5f0d198399f2d3b867a14a43b56a5388893379..406c50aa45b3cc9f172fb34e632b77e426b91e8c 100644 (file)
--- 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 ca53e3ae444f520102c62dcc56d4f808d86e4170..76e550b10203eaa4a8ebc1e39ecdd81b1b8f0afd 100644 (file)
--- 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 f9ae7453f49bd5c21b360a4f0cedd8b06c631380..0f4869fdca0b032561e3c060b9979347ef4cde77 100644 (file)
--- 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 5d9b39acd6ebd3ea1aa9087ec911f967cf316744..e6e4450534efb990eab2948500a467eb41c52cf5 100644 (file)
--- 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 ae852f8ff8b92ce762cad99cb3d8d3b8c0cd3b6f..70e0e1c60e97a5cf71040a1aacf270b0c777dfde 100644 (file)
--- 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 a5926561d317c02d51d91fa62d46830af572eaf4..0fba6348985f811a304ac15d049c08f43b9022c0 100644 (file)
--- 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 d9ac4e12ed368c1bae8cb7d971d80682e5ab7813..6baaaa4770ad94c093d461ab076654902551f116 100644 (file)
--- 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 2fe4ff3b4a128429f4be4e89bfbf359c69813875..486779d2ba1c1b79e7e396659320bd1918d48017 100644 (file)
--- 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 d8edc37ab81cab1f5ed0280d2fd714d87356bd1e..facf703e9c7f95dbe781b78baeee71bdf22c4d1a 100644 (file)
--- 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 b29b9a4271a76021f30ad1ab81b66994974c98b1..784f0758a03ca43fa62bdfdbe4d86a28420f7f12 100644 (file)
--- 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 722506f87c043afd62aa8b70bcb4a3592d8474ea..7ef216254d5f0020d03cbd9a2943e1c75f685105 100644 (file)
--- 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 55a186a3839190b483ecca153c1ee314162985d4..21a2d8dd5eca61e6a59028c7e750bcc39ccadbb6 100644 (file)
--- 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 76361763c3d9c969530446ec9be6484dc6e5739f..da989e07856f921ec0e0ebfbd0c61a7d3dfc124a 100644 (file)
--- 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 f9bd11aae1b494912f66b855283529480d9742d4..6e58b37a073d3bb662735ba64cabf504c219350a 100644 (file)
--- 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 2954009255065971462b16d930002f6b3b271e0b..94a64469f917a0848d9bca516f3fd8dc2fa14961 100644 (file)
--- 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 f9a46787e7804cc2291388123cfacff705d556e0..341470ab84b933cb687caedd2dfee3b141143428 100644 (file)
--- 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 b5c20ab7f713131697291f5c380e052129ef6f0b..3b3237175bf2c184300b6f1d901c6281f46a97bb 100644 (file)
--- 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 a65d79a83c6dc17b3a00b6ed9aa187d19a4c5967..08406b272596f4310dec0a82b2416475199d07f4 100644 (file)
--- 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 74f53bfb616bd0fdd8f1ea567c49f335b90e569f..04f9e71ceb9524e9cf404b22767b6d1c85c33f13 100644 (file)
--- 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 78dbd4065c1ad7080b421052a60a4528f5c3188c..d8e32a13073215da589bca7ba030603aa9308920 100644 (file)
--- 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 c289488a18c29c17ec3291235991afd165abb679..5f7dd107a14f87eeafe522ba069152db24710236 100644 (file)
--- 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 933163a27619df2eb33267acf2c6ff2c1cdb8674..82e6a1facb7df9aefbb687804a5a9cb0bfea43b9 100644 (file)
--- 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 5f4046d6d952d32544257fefd25d6f683c7e694a..3b972ee909c1ae7d46c5eea10884ff161bb9d216 100644 (file)
--- 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 fe9870d84997aeb8e6ac191c6f26092bff737913..664f024b0a358e8524a98b67cc914049f818d346 100644 (file)
--- 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 a83175c0b472eef7b46d477e4771ac759475eebc..9c20ebd9af7694f55fbef6265c56c17ae9f33733 100644 (file)
--- 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 22022fdd521263ced0c47e4e8b17547b0dd47364..b2d4efc5063527d571dd1f674a8faecb4b3b4c11 100644 (file)
--- 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 7a27b6c9eca21ff511bb594526cef85eed903c6d..fdab85a720bfeb2b32cd7dbd3b8c742e060aadb1 100644 (file)
--- 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 fa7914e29338fd87553817f0313692e6b0ac5b63..ee4e338d7183d971e2424ee8a1e3d987a6940229 100644 (file)
--- 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 7d39034f6961bd5bf238bc7a67a30eeca8b49e78..02033af1f87bdaa95963bc5bb1ee79e22985fd92 100644 (file)
--- 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!  */