diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:21:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:21:26 +0000 |
| commit | c5b737231debe51edb769a0b5667ee9719e560e0 (patch) | |
| tree | 9abeaec24486a888ef3bbfe2c179180dbecafd35 /util-linux/volume_id/minix.c | |
| parent | 592d4fe7722b094b18194cdf6a692a71a116e4ca (diff) | |
| download | busybox-w32-c5b737231debe51edb769a0b5667ee9719e560e0.tar.gz busybox-w32-c5b737231debe51edb769a0b5667ee9719e560e0.tar.bz2 busybox-w32-c5b737231debe51edb769a0b5667ee9719e560e0.zip | |
volude_id: remove unused fields and functions which were setting them
function old new delta
uuidcache_init 567 704 +137
findfs_main - 125 +125
packed_usage 23662 23694 +32
static.drive_name_string - 14 +14
applet_names 1815 1822 +7
applet_main 1104 1108 +4
volume_id_open_node 35 38 +3
applet_nameofs 552 554 +2
get_devname_from_label 78 79 +1
applet_install_loc 138 139 +1
volume_id_set_label_unicode16 31 27 -4
volume_id_set_label_string 74 70 -4
get_devname_from_uuid 63 59 -4
fs1 12 8 -4
volume_id_set_unicode16 209 202 -7
volume_id_free_buffer 71 56 -15
free_volume_id 52 37 -15
volume_id_probe_luks 97 79 -18
volume_id_set_usage_part 21 - -21
volume_id_probe_ufs 148 126 -22
volume_id_probe_lsi_mega_raid 131 108 -23
volume_id_probe_highpoint_45x_raid 127 104 -23
volume_id_probe_highpoint_37x_raid 87 63 -24
volume_id_set_usage 28 - -28
volume_id_probe_romfs 121 93 -28
volume_id_set_label_raw 30 - -30
volume_id_probe_promise_fasttrack_raid 174 144 -30
volume_id_set_uuid 373 342 -31
volume_id_probe_xfs 122 91 -31
volume_id_probe_jfs 138 107 -31
volume_id_probe_ocfs2 139 107 -32
volume_id_probe_lvm1 90 58 -32
volume_id_probe_cramfs 106 63 -43
volume_id_probe_via_raid 145 101 -44
volume_id_probe_intel_software_raid 153 108 -45
volume_id_probe_minix 121 74 -47
volume_id_probe_udf 682 632 -50
volume_id_probe_nvidia_raid 158 108 -50
volume_id_probe_lvm2 128 78 -50
volume_id_probe_hpfs 117 67 -50
volume_id_probe_ext 143 93 -50
volume_id_probe_linux_raid 191 139 -52
volume_id_probe_sysv 244 187 -57
volume_id_probe_silicon_medley_raid 158 97 -61
usage_to_string 64 - -64
volume_id_probe_linux_swap 263 198 -65
volume_id_get_buffer 372 307 -65
volume_id_probe_iso9660 412 332 -80
volume_id_probe_hfs_hfsplus 888 806 -82
volume_id_probe_ntfs 396 294 -102
volume_id_probe_vfat 980 872 -108
volume_id_probe_reiserfs 417 268 -149
dev_get_major_minor 175 - -175
uuidcache_check_device 692 499 -193
volume_id_probe_mac_partition_map 697 - -697
------------------------------------------------------------------------------
(add/remove: 2/6 grow/shrink: 8/39 up/down: 326/-2836) Total: -2510 bytes
text data bss dec hex filename
797220 662 7420 805302 c49b6 busybox_old
794244 662 7420 802326 c3e16 busybox_unstripped
Diffstat (limited to 'util-linux/volume_id/minix.c')
| -rw-r--r-- | util-linux/volume_id/minix.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/util-linux/volume_id/minix.c b/util-linux/volume_id/minix.c index ede23cb24..2f5209333 100644 --- a/util-linux/volume_id/minix.c +++ b/util-linux/volume_id/minix.c | |||
| @@ -20,8 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include "volume_id_internal.h" | 21 | #include "volume_id_internal.h" |
| 22 | 22 | ||
| 23 | struct minix_super_block | 23 | struct minix_super_block { |
| 24 | { | ||
| 25 | uint16_t s_ninodes; | 24 | uint16_t s_ninodes; |
| 26 | uint16_t s_nzones; | 25 | uint16_t s_nzones; |
| 27 | uint16_t s_imap_blocks; | 26 | uint16_t s_imap_blocks; |
| @@ -46,31 +45,31 @@ int volume_id_probe_minix(struct volume_id *id, uint64_t off) | |||
| 46 | if (ms == NULL) | 45 | if (ms == NULL) |
| 47 | return -1; | 46 | return -1; |
| 48 | 47 | ||
| 49 | if (le16_to_cpu(ms->s_magic) == 0x137f) { | 48 | if (ms->s_magic == cpu_to_le16(0x137f)) { |
| 50 | id->type_version[0] = '1'; | 49 | // id->type_version[0] = '1'; |
| 51 | goto found; | 50 | goto found; |
| 52 | } | 51 | } |
| 53 | 52 | ||
| 54 | if (le16_to_cpu(ms->s_magic) == 0x1387) { | 53 | if (ms->s_magic == cpu_to_le16(0x1387)) { |
| 55 | id->type_version[0] = '1'; | 54 | // id->type_version[0] = '1'; |
| 56 | goto found; | 55 | goto found; |
| 57 | } | 56 | } |
| 58 | 57 | ||
| 59 | if (le16_to_cpu(ms->s_magic) == 0x2468) { | 58 | if (ms->s_magic == cpu_to_le16(0x2468)) { |
| 60 | id->type_version[0] = '2'; | 59 | // id->type_version[0] = '2'; |
| 61 | goto found; | 60 | goto found; |
| 62 | } | 61 | } |
| 63 | 62 | ||
| 64 | if (le16_to_cpu(ms->s_magic) == 0x2478) { | 63 | if (ms->s_magic == cpu_to_le16(0x2478)) { |
| 65 | id->type_version[0] = '2'; | 64 | // id->type_version[0] = '2'; |
| 66 | goto found; | 65 | goto found; |
| 67 | } | 66 | } |
| 68 | 67 | ||
| 69 | return -1; | 68 | return -1; |
| 70 | 69 | ||
| 71 | found: | 70 | found: |
| 72 | id->type_version[1] = '\0'; | 71 | // id->type_version[1] = '\0'; |
| 73 | volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); | 72 | // volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); |
| 74 | id->type = "minix"; | 73 | // id->type = "minix"; |
| 75 | return 0; | 74 | return 0; |
| 76 | } | 75 | } |