volume_id: remove some global symbols

diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c
index a6e378dd283d6792207bad5fa566d65ae12eb75e..f666b183790d8c74ccff836d46034fbb06b3d5ac 100644 (file)
--- a/extras/volume_id/lib/hfs.c
+++ b/extras/volume_id/lib/hfs.c
@@ -36,7 +36,7 @@ struct hfs_finder_info{
        uint8_t         id[8];
 } PACKED;
 
        uint8_t         id[8];
 } PACKED;
 

-struct hfs_mdb {
+static struct hfs_mdb {

        uint8_t         signature[2];
        uint32_t        cr_date;
        uint32_t        ls_Mod;
        uint8_t         signature[2];
        uint32_t        cr_date;
        uint32_t        ls_Mod;


@@ -104,7 +104,7 @@ struct hfsplus_fork {
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
 } PACKED;
 
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
 } PACKED;
 

-struct hfsplus_vol_header {
+static struct hfsplus_vol_header {

        uint8_t         signature[2];
        uint16_t        version;
        uint32_t        attributes;
        uint8_t         signature[2];
        uint16_t        version;
        uint32_t        attributes;

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 85e8d8109b769facb09e38ee45a43055165dbefd..ad4a5ba4d679168a398fd9b60b7c869a16dfef4a 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -26,7 +26,7 @@
 #include "libvolume_id.h"
 #include "util.h"
 
 #include "libvolume_id.h"
 #include "util.h"
 

-struct mdp_super_block {
+static struct mdp_super_block {

        uint32_t        md_magic;
        uint32_t        major_version;
        uint32_t        minor_version;
        uint32_t        md_magic;
        uint32_t        major_version;
        uint32_t        minor_version;

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 0193648c9ef460c1d3c9e4439e6f185ed3ceba8e..b63f1e6c002b622dc05f5366f20ec87039ef5d85 100644 (file)
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -26,7 +26,7 @@
 #include "libvolume_id.h"
 #include "util.h"
 
 #include "libvolume_id.h"
 #include "util.h"
 

-struct swap_header_v1_2 {
+static struct swap_header_v1_2 {

        uint8_t         bootbits[1024];
        uint32_t        version;
        uint32_t        last_page;
        uint8_t         bootbits[1024];
        uint32_t        version;
        uint32_t        last_page;

diff --git a/extras/volume_id/lib/luks.c b/extras/volume_id/lib/luks.c
index 64de85ac217679b59ad8ce4d2a30f7a63a449fae..f3ec20eade39d0bbe9595a1c7cf3ae7ec36ce75a 100644 (file)
--- a/extras/volume_id/lib/luks.c
+++ b/extras/volume_id/lib/luks.c
@@ -36,7 +36,7 @@
 #define LUKS_SALTSIZE                  32
 #define LUKS_NUMKEYS                   8
 
 #define LUKS_SALTSIZE                  32
 #define LUKS_NUMKEYS                   8
 

-const uint8_t LUKS_MAGIC[] = {'L','U','K','S', 0xba, 0xbe};
+static const uint8_t LUKS_MAGIC[] = {'L','U','K','S', 0xba, 0xbe};

 #define LUKS_MAGIC_L 6
 #define LUKS_PHDR_SIZE (sizeof(struct luks_phdr)/SECTOR_SIZE+1)
 #define UUID_STRING_L 40
 #define LUKS_MAGIC_L 6
 #define LUKS_PHDR_SIZE (sizeof(struct luks_phdr)/SECTOR_SIZE+1)
 #define UUID_STRING_L 40

diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c
index 23c64fc3071ee251f5df9bd1c9793f83c175a1f6..f1e8c4bc294422e6781302ad34d25c7f777e9c88 100644 (file)
--- a/extras/volume_id/lib/ntfs.c
+++ b/extras/volume_id/lib/ntfs.c
@@ -26,7 +26,7 @@
 #include "libvolume_id.h"
 #include "util.h"
 
 #include "libvolume_id.h"
 #include "util.h"
 

-struct ntfs_super_block {
+static struct ntfs_super_block {

        uint8_t         jump[3];
        uint8_t         oem_id[8];
        uint16_t        bytes_per_sector;
        uint8_t         jump[3];
        uint8_t         oem_id[8];
        uint16_t        bytes_per_sector;


@@ -53,7 +53,7 @@ struct ntfs_super_block {
        uint16_t        checksum;
 } PACKED *ns;
 
        uint16_t        checksum;
 } PACKED *ns;
 

-struct master_file_table_record {
+static struct master_file_table_record {

        uint8_t         magic[4];
        uint16_t        usa_ofs;
        uint16_t        usa_count;
        uint8_t         magic[4];
        uint16_t        usa_ofs;
        uint16_t        usa_count;


@@ -66,7 +66,7 @@ struct master_file_table_record {
        uint32_t        bytes_allocated;
 } PACKED *mftr;
 
        uint32_t        bytes_allocated;
 } PACKED *mftr;
 

-struct file_attribute {
+static struct file_attribute {

        uint32_t        type;
        uint32_t        len;
        uint8_t         non_resident;
        uint32_t        type;
        uint32_t        len;
        uint8_t         non_resident;


@@ -78,7 +78,7 @@ struct file_attribute {
        uint16_t        value_offset;
 } PACKED *attr;
 
        uint16_t        value_offset;
 } PACKED *attr;
 

-struct volume_info {
+static struct volume_info {

        uint64_t        reserved;
        uint8_t         major_ver;
        uint8_t         minor_ver;
        uint64_t        reserved;
        uint8_t         major_ver;
        uint8_t         minor_ver;