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
This commit is contained in:
		@@ -166,13 +166,13 @@ int volume_id_probe_ntfs(struct volume_id *id, uint64_t off)
 | 
			
		||||
		dbg("found attribute type 0x%x, len %i, at offset %i",
 | 
			
		||||
		    attr_type, attr_len, attr_off);
 | 
			
		||||
 | 
			
		||||
		if (attr_type == MFT_RECORD_ATTR_VOLUME_INFO) {
 | 
			
		||||
			struct volume_info *info;
 | 
			
		||||
			dbg("found info, len %i", val_len);
 | 
			
		||||
			info = (struct volume_info*) (((uint8_t *) attr) + val_off);
 | 
			
		||||
			snprintf(id->type_version, sizeof(id->type_version)-1,
 | 
			
		||||
				 "%u.%u", info->major_ver, info->minor_ver);
 | 
			
		||||
		}
 | 
			
		||||
//		if (attr_type == MFT_RECORD_ATTR_VOLUME_INFO) {
 | 
			
		||||
//			struct volume_info *info;
 | 
			
		||||
//			dbg("found info, len %i", val_len);
 | 
			
		||||
//			info = (struct volume_info*) (((uint8_t *) attr) + val_off);
 | 
			
		||||
//			snprintf(id->type_version, sizeof(id->type_version)-1,
 | 
			
		||||
//				 "%u.%u", info->major_ver, info->minor_ver);
 | 
			
		||||
//		}
 | 
			
		||||
 | 
			
		||||
		if (attr_type == MFT_RECORD_ATTR_VOLUME_NAME) {
 | 
			
		||||
			dbg("found label, len %i", val_len);
 | 
			
		||||
@@ -180,14 +180,14 @@ int volume_id_probe_ntfs(struct volume_id *id, uint64_t off)
 | 
			
		||||
				val_len = VOLUME_ID_LABEL_SIZE;
 | 
			
		||||
 | 
			
		||||
			val = ((uint8_t *) attr) + val_off;
 | 
			
		||||
			volume_id_set_label_raw(id, val, val_len);
 | 
			
		||||
//			volume_id_set_label_raw(id, val, val_len);
 | 
			
		||||
			volume_id_set_label_unicode16(id, val, LE, val_len);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 found:
 | 
			
		||||
	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 | 
			
		||||
	id->type = "ntfs";
 | 
			
		||||
//	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 | 
			
		||||
//	id->type = "ntfs";
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user