rgw: remove strerror references

We have cpp_strerror, let's use it and be threadsafe!

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 0074bb533bce12aced24ebf4742015a01062afce..85acab46216732c2d39a864d0ffa62afe8e8d50e 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -8,6 +8,7 @@ using namespace std;
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "common/common_init.h"
+#include "common/errno.h"
 
 #include "common/armor.h"
 #include "rgw_user.h"
@@ -100,8 +101,7 @@ int gen_rand_base64(char *dest, int size) /* size should be the required string
 
   ret = get_random_bytes(buf, sizeof(buf));
   if (ret < 0) {
-    // assuming no threads here, for strerror
-    cerr << "cannot get random bytes: " << strerror(-ret) << std::endl;
+    cerr << "cannot get random bytes: " << cpp_strerror(-ret) << std::endl;
     return -1;
   }
 
@@ -124,8 +124,7 @@ int gen_rand_alphanumeric(char *dest, int size) /* size should be the required s
 {
   int ret = get_random_bytes(dest, size);
   if (ret < 0) {
-    // assuming no threads here, for strerror
-    cerr << "cannot get random bytes: " << strerror(-ret) << std::endl;
+    cerr << "cannot get random bytes: " << cpp_strerror(-ret) << std::endl;
     return -1;
   }
 
@@ -323,7 +322,7 @@ int main(int argc, char **argv)
       info.openstack_name = openstack_user;
   
     if ((err = rgw_store_user_info(info)) < 0) {
-      cerr << "error storing user info: " << strerror(-err) << std::endl;
+      cerr << "error storing user info: " << cpp_strerror(-err) << std::endl;
       break;
     }
 
@@ -403,13 +402,15 @@ int main(int argc, char **argv)
     uint64_t size;
     int r = store->obj_stat(log_bucket, oid, &size, NULL);
     if (r < 0) {
-      cerr << "error while doing stat on " <<  log_bucket << ":" << oid << " " << strerror(-r) << std::endl;
+      cerr << "error while doing stat on " <<  log_bucket << ":" << oid
+          << " " << cpp_strerror(-r) << std::endl;
       return -r;
     }
     bufferlist bl;
     r = store->read(log_bucket, oid, 0, size, bl);
     if (r < 0) {
-      cerr << "error while reading from " <<  log_bucket << ":" << oid << " " << strerror(-r) << std::endl;
+      cerr << "error while reading from " <<  log_bucket << ":" << oid
+          << " " << cpp_strerror(-r) << std::endl;
       return -r;
     }
 

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 406615622687b1ba252a37f310d252d1a9fbef23..d5d7c61b9dea59621225bef12c8ceb0154232a42 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -3,6 +3,7 @@
 #include <string>
 #include <map>
 
+#include "common/errno.h"
 #include "rgw_access.h"
 #include "rgw_acl.h"
 
@@ -321,7 +322,8 @@ int rgw_add_bucket(string user_id, string bucket_name)
 
     ret = rgwstore->tmap_set(ui_bucket, buckets_obj_id, bucket_name, bl);
     if (ret < 0) {
-      RGW_LOG(0) << "error adding bucket to directory: " << strerror(-ret)<< std::endl;
+      RGW_LOG(0) << "error adding bucket to directory: "
+                << cpp_strerror(-ret)<< std::endl;
     }
   } else {
     RGWUserBuckets buckets;
@@ -360,7 +362,8 @@ int rgw_remove_bucket(string user_id, string bucket_name)
 
     ret = rgwstore->tmap_del(ui_bucket, buckets_obj_id, bucket_name);
     if (ret < 0) {
-      RGW_LOG(0) << "error removing bucket from directory: " << strerror(-ret)<< std::endl;
+      RGW_LOG(0) << "error removing bucket from directory: "
+                << cpp_strerror(-ret)<< std::endl;
     }
   } else {
     RGWUserBuckets buckets;