ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wipefs: always print devname 

It seems too smart to print devname according to number of devices.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-03-01 15:44:04 +01:00
parent c10695f8a4
commit 86ace3f407
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc-utils/wipefs.c
View File

@ -59,7 +59,6 @@ struct wipe_desc {
#define WP_MODE_PARSABLE 1
static const char *type_pattern;
int ndevices;
static void
print_pretty(struct wipe_desc *wp, int line)
@ -288,13 +287,8 @@ do_wipe(struct wipe_desc *wp, const char *devname, int noact, int all, int quiet
else if (!quiet) {
size_t i;
if (ndevices > 1)
printf(_("%s: %zd bytes were erased at offset 0x%08jx (%s): "),
devname, wp->len, wp->offset, wp->type);
else
/* wipefs does not printf devname originally */
printf(_("%zd bytes were erased at offset 0x%08jx (%s): "),
wp->len, wp->offset, wp->type);
printf(_("%s: %zd bytes were erased at offset 0x%08jx (%s): "),
devname, wp->len, wp->offset, wp->type);
for (i = 0; i < wp->len; i++) {
printf("%02x", wp->magic[i]);
@ -444,7 +438,6 @@ main(int argc, char **argv)
/*
* Erase
*/
ndevices = argc - optind;
while (optind < argc) {
wp = clone_offset(wp0);
wp = do_wipe(wp, argv[optind++], noact, all, quiet);