Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update device.c #356

Merged
merged 1 commit into from
Nov 7, 2021
Merged

Update device.c #356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
return 1;
}

/* Remove leading/training whitespace from a string and left justify result */
/* Remove leading/trailing whitespace from a string and left justify result */
char* trim( char* str )
{
size_t len = 0;
Expand Down Expand Up @@ -397,7 +397,7 @@ int nwipe_get_device_bus_type_and_serialno( char* device, nwipe_device_t* bus, c
* 2 = readlink exit code not 0, see nwipe logs
* 3 = popen failed to create stream for smartctl
* 4 = smartctl command not found, install smartmontools
* 5 = smartctl detected un supported USB to IDE/SATA adapter
* 5 = smartctl detected unsupported USB to IDE/SATA adapter
* 6 = All other errors !
*
*/
Expand Down Expand Up @@ -672,11 +672,11 @@ int nwipe_get_device_bus_type_and_serialno( char* device, nwipe_device_t* bus, c

if( exit_status == 1 )
{
nwipe_log( NWIPE_LOG_WARNING, "%s USB bridge, no passthru support", device );
nwipe_log( NWIPE_LOG_WARNING, "%s USB bridge, no pass-through support", device );

if( *bus == NWIPE_DEVICE_USB )
{
strcpy( serialnumber, "(no ATA pass thru)" );
strcpy( serialnumber, "(no ATA pass-through)" );
PartialVolume marked this conversation as resolved.
Show resolved Hide resolved
set_return_value = 5;
}
}
Expand Down Expand Up @@ -704,7 +704,7 @@ void strip_CR_LF( char* str )

void remove_ATA_prefix( char* str )
{
/* Remove "ATA " prefix if present in the model no. string, left justifing string */
/* Remove "ATA" prefix if present in the model no. string, left justifing string */

int idx_pre = 4;
int idx_post = 0;
Expand Down