kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dasdfmt: Improve error message construction

Browse Source 
In check_track_format() the base error message is the same for all cases
but has different additional content depending on which mode dasdfmt is
running.

Currently the message is compiled by using different outputs. To make it
a little bit cleaner and for a better error message handling, construct
the message string completely before passing it to the error() function
for output.

Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Jan Höppner
2020-10-26 02:39:27 +01:00
parent 732b3dddab
commit 9fe491df27
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dasdfmt/dasdfmt.c
View File

@@ -791,19 +791,18 @@ static format_check_t check_track_format(format_data_t *p)
.stop_unit = p->stop_unit
}, 0
};
char msg[128] = "";
int err;
err = dasd_check_format(g.dev_node, &cdata);
if (err != 0) {
if (err == ENOTTY) {
ERRMSG("%s: Missing kernel support for format checking",
prog_name);
if (mode == EXPAND) {
ERRMSG(". Mode 'expand' cannot be used");
} else if (!g.check) {
ERRMSG(" (--force to override)");
}
error(".");
sprintf(msg, "Missing kernel support for format checking");
if (mode == EXPAND)
strcat(msg, ". Mode 'expand' cannot be used");
else if (!g.check)
strcat(msg, " (--force to override)");
error("%s.", msg);
}
error("Could not check format: %s", strerror(err));
}