]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9170 from Yan-waller/yj-wip-fixrgwnew
authorOrit Wasserman <owasserm@redhat.com>
Fri, 23 Sep 2016 13:40:23 +0000 (15:40 +0200)
committerGitHub <noreply@github.com>
Fri, 23 Sep 2016 13:40:23 +0000 (15:40 +0200)
rgw/admin: fix some return values and indents
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1  2 
src/rgw/rgw_admin.cc

index 04a81f3ea07438b7df9ea90a01074d0ce247e6b6,8938346e9d8ee8bc58bc232904b972e8bcdc8c78..db805067506b02e41bbe7218c8cc7e918a745a3c
@@@ -3227,9 -3178,9 +3227,9 @@@ int main(int argc, char **argv
        int ret = zonegroupmap.read(g_ceph_context, store);
        if (ret < 0 && ret != -ENOENT) {
          cerr << "failed to read zonegroupmap info: " << cpp_strerror(ret);
-         return ret;
+         return -ret;
        }
 -              
 +
        encode_json("zonegroup-map", zonegroupmap, formatter);
        formatter->flush(cout);
        }
        jf.flush(bl);
  
        JSONParser p;
 -      ret = send_to_remote_gateway(url, info, bl, p);
 +      ret = send_to_remote_or_url(remote, url, access_key, secret_key,
 +                                  info, bl, p);
        if (ret < 0) {
          cerr << "request failed: " << cpp_strerror(-ret) << std::endl;
-         return ret;
+         return -ret;
        }
      }
      return 0;