Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258 from PartialVolume/Remove_unnecssary_ATA_that_prefixes_some_model_numbers

Browse Source 
Remove redundant ATA prefix from the model number.
This commit is contained in:
PartialVolume
2020-04-08 17:10:07 +01:00
committed by GitHub
parent 5aded13bf7 fcd35ea910
commit 68ef665b2d
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/device.c
View File

@@ -206,6 +206,7 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
/* Get device information */
next_device->device_model = dev->model;
remove_ATA_prefix( next_device->device_model );
next_device->device_name = dev->path;
next_device->device_size = dev->length * dev->sector_size;
Determine_C_B_nomenclature( next_device->device_size, next_device->device_size_txt, NWIPE_DEVICE_SIZE_TXT_LENGTH );
@@ -683,3 +684,21 @@ void strip_CR_LF( char* str )
idx++;
}
}
void remove_ATA_prefix( char* str )
{
/* Remove "ATA " prefix if present in the model no. string, left justifing string */
int idx_pre = 4;
int idx_post = 0;
if( !strncmp( str, "ATA ", 4 ) )
{
while( str[idx_pre] != 0 )
{
str[idx_post++] = str[idx_pre++];
}
str[idx_post] = 0;
}
}

1
src/device.h
View File

@@ -29,5 +29,6 @@ int nwipe_device_get( nwipe_context_t*** c, char** devnamelist, int ndevnames );
int nwipe_get_device_bus_type_and_serialno( char*, nwipe_device_t*, char* );
void strip_CR_LF( char* );
void determine_disk_capacity_nomenclature( u64, char* );
void remove_ATA_prefix( char* );
#endif /* DEVICE_H_ */