Resolve gcc warnings.

PATCH New Josh Pieper 1 participant 1 message Nov 13, 2011

Share & tools

Josh Pieper

author

2011-11-13 14:13 UTC #0 lore raw

PATCH 2/2 Resolve gcc warnings.

From e4b9ae75724022cd1a557fde967b130888a35870 Mon Sep 17 00:00:00 2001
From: Josh Pieper <[email protected]>
Date: Fri, 11 Nov 2011 08:19:55 -0500
Subject: [PATCH 2/2] rgw: Fix some merge problems uncovered by gcc warnings:

* a refactor in e2100bce left the mod_ptr and unmod_ptr members set incorrectly in RGWCopyObj::init_common
* a fix in 6752babd aggregated error returns, but then failed to do anything with them

Signed-off-by Josh Pieper <[email protected]>

---
 src/rgw/rgw_op.cc    |    4 ----
 src/rgw/rgw_op.h     |    2 ++
 src/rgw/rgw_rados.cc |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

src/rgw/rgw_op.cc +0 -4

index 802734e..42b4c25 100644
@@ -1004,10 +1004,6 @@ int RGWCopyObj::verify_permission()
 
 int RGWCopyObj::init_common()
 {
-  time_t mod_time;
-  time_t unmod_time;
-  time_t *mod_ptr = NULL;
-  time_t *unmod_ptr = NULL;
   if (if_mod) {
     if (parse_time(if_mod, &mod_time) < 0) {
       ret = -EINVAL;

src/rgw/rgw_op.h +2 -0

index d9c19dd..6557c38 100644
@@ -309,6 +309,8 @@ protected:
   off_t ofs;
   off_t len;
   off_t end;
+  time_t mod_time;
+  time_t unmod_time;
   time_t *mod_ptr;
   time_t *unmod_ptr;
   int ret;

src/rgw/rgw_rados.cc +1 -1

index 147763d..146050b 100644
@@ -915,7 +915,7 @@ int RGWRados::set_buckets_enabled(vector<rgw_bucket>& buckets, bool enabled)
       continue;
     }
   }
-  return 0;
+  return ret;
 }
 
 int RGWRados::bucket_suspended(rgw_bucket& bucket, bool *suspended)

Signature · 1 line

1.7.5.4