From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 11 Mar 2013 14:52:34 +0000 (+0100)
Subject: rgw/rgw_admin.cc: remove twice check for 'object'
X-Git-Tag: v0.60~106^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30938f689ca69edb614e575c173dbbe0cbf369c0;p=ceph.git

rgw/rgw_admin.cc: remove twice check for 'object'

Remove twice checked 'object'. Put checks in alphabetic order to make
double checks easier to catch.

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 2095238874aa..7a1fe73ae6e7 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -226,21 +226,20 @@ static void perm_to_str(uint32_t mask, char *buf, int len)
 static int get_cmd(const char *cmd, const char *prev_cmd, bool *need_more)
 {
   *need_more = false;
-  if (strcmp(cmd, "user") == 0 ||
-      strcmp(cmd, "subuser") == 0 ||
-      strcmp(cmd, "key") == 0 ||
+  if (strcmp(cmd, "bucket") == 0 ||
       strcmp(cmd, "buckets") == 0 ||
-      strcmp(cmd, "bucket") == 0 ||
+      strcmp(cmd, "caps") == 0 ||
+      strcmp(cmd, "cluster") == 0 ||
+      strcmp(cmd, "gc") == 0 || 
+      strcmp(cmd, "key") == 0 ||
+      strcmp(cmd, "log") == 0 ||
       strcmp(cmd, "object") == 0 ||
       strcmp(cmd, "pool") == 0 ||
       strcmp(cmd, "pools") == 0 ||
-      strcmp(cmd, "log") == 0 ||
-      strcmp(cmd, "usage") == 0 ||
-      strcmp(cmd, "object") == 0 ||
-      strcmp(cmd, "cluster") == 0 ||
+      strcmp(cmd, "subuser") == 0 ||
       strcmp(cmd, "temp") == 0 ||
-      strcmp(cmd, "caps") == 0 ||
-      strcmp(cmd, "gc") == 0) {
+      strcmp(cmd, "usage") == 0 ||
+      strcmp(cmd, "user") == 0) {
     *need_more = true;
     return 0;
   }