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.

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

Distinguish between a wipe & verify #378

Merged
Changes from all commits
Commits
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
25 changes: 16 additions & 9 deletions src/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,19 +727,28 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
{
case NWIPE_SELECT_TRUE:

wprintw( main_window,
"[wipe] %s %s [%s] ",
// c[i + offset]->device_name,
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
if( nwipe_options.method == &nwipe_verify_zero || nwipe_options.method == &nwipe_verify_one )
{
wprintw( main_window,
"[vrfy] %s %s [%s] ",
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
}
else
{
wprintw( main_window,
"[wipe] %s %s [%s] ",
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
}
break;

case NWIPE_SELECT_FALSE:
/* Print an element that is not selected. */
wprintw( main_window,
"[ ] %s %s [%s] ",
// c[i + offset]->device_name,
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
Expand All @@ -750,7 +759,6 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
/* This element will be wiped when its parent is wiped. */
wprintw( main_window,
"[****] %s %s [%s] ",
// c[i + offset]->device_name,
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
Expand All @@ -761,7 +769,6 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
/* We can't wipe this element because it has a child that is being wiped. */
wprintw( main_window,
"[----] %s %s [%s] ",
// c[i + offset]->device_name,
c[i + offset]->gui_device_name,
c[i + offset]->device_type_str,
c[i + offset]->device_size_text );
Expand Down