From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 13 Oct 2017 19:49:15 +0000 (+0200)
Subject: rgw_admin.cc: remove redundant check
X-Git-Tag: v13.0.1~358^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2e9c8d8d5f068d771d7a5631700d597b98a42c8;p=ceph.git

rgw_admin.cc: remove redundant check

Fix for:

[src/rgw/rgw_admin.cc:4228]: (style) Redundant condition:
 If 'ret < 0', the comparison 'ret' is always true.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index ec1786b1cb6c..17146ae2d36b 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4222,7 +4222,7 @@ int main(int argc, const char **argv)
 	  cerr << "WARNING: failed to initialize zonegroup " << zonegroup_name << std::endl;
 	} else {
 	  ret = zonegroup.rename_zone(zone);
-	  if (ret < 0 && ret ) {
+	  if (ret < 0) {
 	    cerr << "Error in zonegroup rename for " << zone_name << ": " << cpp_strerror(-ret) << std::endl;
 	    return -ret;
 	  }