From: Jos Collin <jcollin@redhat.com>
Date: Thu, 13 Jul 2017 01:50:04 +0000 (+0530)
Subject: tools/rbd: Removed unreachable returns
X-Git-Tag: v12.1.3~24^2~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef0766c9d36cd14823ae6a546f4de5f663a4b33b;p=ceph.git

tools/rbd: Removed unreachable returns

Removed unreachable returns as the usage() always exits the process.

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 5e7f98dcaa4d..a3d3577310cc 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -1028,7 +1028,7 @@ static int rbd_nbd(int argc, const char *argv[])
   r = parse_args(args, &err_msg, &cfg);
   if (r == HELP_INFO) {
     usage();
-    return 0;
+    assert(false);
   } else if (r == VERSION_INFO) {
     std::cout << pretty_version_to_str() << std::endl;
     return 0;
@@ -1061,7 +1061,8 @@ static int rbd_nbd(int argc, const char *argv[])
       break;
     default:
       usage();
-      return -EINVAL;
+      assert(false);
+      break;
   }
 
   return 0;