diff options
author | Kay Sievers <kay.sievers@suse.de> | 2006-03-27 23:03:25 +0200 |
---|---|---|
committer | Kay Sievers <kay.sievers@suse.de> | 2006-03-27 23:03:25 +0200 |
commit | d5618ac96913efa0b52501b6a5c690bee6a33517 (patch) | |
tree | 0d0d140673ca18f57da2d71c1800757708b0ecc4 | |
parent | e688ad2d0da96db1e801ccc21189111ddee1bf40 (diff) |
volume_id: remove some global symbols
-rw-r--r-- | extras/volume_id/lib/hfs.c | 4 | ||||
-rw-r--r-- | extras/volume_id/lib/linux_raid.c | 2 | ||||
-rw-r--r-- | extras/volume_id/lib/linux_swap.c | 2 | ||||
-rw-r--r-- | extras/volume_id/lib/luks.c | 2 | ||||
-rw-r--r-- | extras/volume_id/lib/ntfs.c | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c index a6e378dd28..f666b18379 100644 --- 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; -struct hfs_mdb { +static struct hfs_mdb { 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_vol_header { +static struct hfsplus_vol_header { 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 85e8d8109b..ad4a5ba4d6 100644 --- 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" -struct mdp_super_block { +static struct mdp_super_block { 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 0193648c9e..b63f1e6c00 100644 --- 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" -struct swap_header_v1_2 { +static struct swap_header_v1_2 { 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 64de85ac21..f3ec20eade 100644 --- 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 -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 diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c index 23c64fc307..f1e8c4bc29 100644 --- 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" -struct ntfs_super_block { +static struct ntfs_super_block { 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; -struct master_file_table_record { +static struct master_file_table_record { 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; -struct file_attribute { +static struct file_attribute { uint32_t type; uint32_t len; uint8_t non_resident; @@ -78,7 +78,7 @@ struct file_attribute { uint16_t value_offset; } PACKED *attr; -struct volume_info { +static struct volume_info { uint64_t reserved; uint8_t major_ver; uint8_t minor_ver; |