From c848046eb984fcbeeb78d681bf483aefbb35a013 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 11 Jun 2015 00:46:30 +0200 Subject: btrfs-progs: print error within test_dev_for_mkfs The error string buffer passed as an argument is of a fixed size, though we could print up to PATH_MAX + something bytes. Print the error message directly. Signed-off-by: David Sterba --- cmds-replace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cmds-replace.c') diff --git a/cmds-replace.c b/cmds-replace.c index 75b131b..85365e3 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -142,7 +142,6 @@ static int cmd_start_replace(int argc, char **argv) int do_not_background = 0; int mixed = 0; DIR *dirstream = NULL; - char estr[100]; /* check test_dev_for_mkfs() for error string size*/ while ((c = getopt(argc, argv, "Brf")) != -1) { switch (c) { @@ -256,11 +255,10 @@ static int cmd_start_replace(int argc, char **argv) start_args.start.srcdevid = 0; } - ret = test_dev_for_mkfs(dstdev, force_using_targetdev, estr); - if (ret) { - fprintf(stderr, "%s", estr); + ret = test_dev_for_mkfs(dstdev, force_using_targetdev); + if (ret) goto leave_with_error; - } + fddstdev = open(dstdev, O_RDWR); if (fddstdev < 0) { fprintf(stderr, "Unable to open %s\n", dstdev); -- cgit v1.2.1