Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assemble: make some plurals conditional. 

"1 devices" is ugly.  Fix it.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2011-12-23 10:49:07 +11:00
parent a408d66c4f
commit 576d028002
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assemble.c
View File

@ -1614,12 +1614,14 @@ int assemble_container_content(struct supertype *st, int mdfd,
if (verbose >= 0) {
if (err)
fprintf(stderr, Name
": array %s now has %d devices",
chosen_name, working + preexist);
": array %s now has %d device%s",
chosen_name, working + preexist,
working + preexist == 1 ? "":"s");
else
fprintf(stderr, Name
": Started %s with %d devices",
chosen_name, working + preexist);
": Started %s with %d device%s",
chosen_name, working + preexist,
working + preexist == 1 ? "":"s");
if (preexist)
fprintf(stderr, " (%d new)", working);
if (expansion)
@ -1634,9 +1636,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
} else {
if (verbose >= 0)
fprintf(stderr, Name
": %s assembled with %d devices but "
": %s assembled with %d device%s but "
"not started\n",
chosen_name, working);
chosen_name, working, working == 1 ? "":"s");
return 1;
}
}

5
Incremental.c
View File

@ -450,8 +450,9 @@ int Incremental(char *devname, int verbose, int runstop,
sysfs_uevent(sra, "change");
if (verbose >= 0)
fprintf(stderr, Name
": container %s now has %d devices\n",
chosen_name, info.array.working_disks);
": container %s now has %d device%s\n",
chosen_name, info.array.working_disks,
info.array.working_disks==1?"":"s");
wait_for(chosen_name, mdfd);
if (st->ss->external)
devnum = fd2devnum(mdfd);