From af0ebeeb0ee04f8c6a82e6d21a1755c360edd886 Mon Sep 17 00:00:00 2001 From: s09816 Date: Fri, 14 Aug 2015 22:31:57 -0400 Subject: [PATCH] rbd:improve the error handle of rbd,check the return value. Signed-off-by: s09816 --- src/rbd.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/rbd.cc diff --git a/src/rbd.cc b/src/rbd.cc old mode 100644 new mode 100755 index fb399b153d23e..f8eedb02ff357 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -3097,7 +3097,10 @@ int main(int argc, const char **argv) return EXIT_FAILURE; } format_specified = true; - g_conf->set_val_or_die("rbd_default_format", val.c_str()); + if (0 != g_conf->set_val("rbd_default_format", val.c_str())) { + cerr << "rbd: image format must be 1 or 2" << std::endl; + return EXIT_FAILURE; + } } else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) { poolname = strdup(val.c_str()); } else if (ceph_argparse_witharg(args, i, &val, "--dest-pool", (char*)NULL)) { -- 2.39.5