From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 10 May 2013 12:03:13 +0000 (+0200)
Subject: rgw/rgw_rest.cc: remove dead and unneeded code
X-Git-Tag: v0.63~41^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b097f65627003baea9c82abc3fb6777593863a03;p=ceph.git

rgw/rgw_rest.cc: remove dead and unneeded code

Since origin and meth are already checked to be true there is
no need to check again in s->cio->print() after the initial check.

1019551 Logically dead code (CWE-561)
1019552 Logically dead code (CWE-561)

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

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index ba38a034c94b..48d09d69ca69 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -347,9 +347,9 @@ void dump_owner(struct req_state *s, string& id, string& name, const char *secti
 void dump_access_control(struct req_state *s, const char *origin, const char *meth,
                          const char *hdr, const char *exp_hdr, uint32_t max_age) {
   if (origin && (origin[0] != '\0')) {
-    s->cio->print("Access-Control-Allow-Origin: %s\n", origin?origin:"");
+    s->cio->print("Access-Control-Allow-Origin: %s\n", origin);
     if (meth && (meth[0] != '\0'))
-      s->cio->print("Access-Control-Allow-Methods: %s\n", meth?meth:"");
+      s->cio->print("Access-Control-Allow-Methods: %s\n", meth);
     if (hdr && (hdr[0] != '\0'))
       s->cio->print("Access-Control-Allow-Headers: %s\n", hdr);
     if (exp_hdr && (exp_hdr[0] != '\0')) {