From: Jiaying Ren <mikulely@gmail.com>
Date: Fri, 29 Jan 2016 08:25:48 +0000 (+0800)
Subject: ceph_osd.cc/ceph_mon.cc: cleanup unreachable exit call
X-Git-Tag: v10.0.4~109^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b99b61e9a5c2b79e3c95029c8b5dee8a8b1b8acf;p=ceph.git

ceph_osd.cc/ceph_mon.cc: cleanup unreachable exit call

The calling chain of usage() is:

  usage()
    ->generic_server_usage()
      ->exit(1)
  exit(0)

so the exit(0) after usage() would not be reached.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index e6e3adaed5de..6b5f43c2351d 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -268,7 +268,6 @@ int main(int argc, const char **argv)
       break;
     } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) {
       usage();
-      exit(0);
     } else if (ceph_argparse_flag(args, i, "--mkfs", (char*)NULL)) {
       mkfs = true;
     } else if (ceph_argparse_flag(args, i, "--compact", (char*)NULL)) {
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index fb5de3688a58..15d46f47f904 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -145,7 +145,6 @@ int main(int argc, const char **argv)
       break;
     } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) {
       usage();
-      exit(0);
     } else if (ceph_argparse_flag(args, i, "--mkfs", (char*)NULL)) {
       mkfs = true;
     } else if (ceph_argparse_flag(args, i, "--mkjournal", (char*)NULL)) {