objclass: pass strings as const references

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc
index e032d77c4faf578c38ac6d37e34f589298e5523a..225c2e2028d92aa2a22d4ff6c290ee0880d42930 100644 (file)
--- a/src/objclass/class_api.cc
+++ b/src/objclass/class_api.cc
@@ -282,8 +282,9 @@ int cls_cxx_map_read_all_keys(cls_method_context_t hctx, map<string, bufferlist>
   return vals->size();
 }
 
-int cls_cxx_map_read_keys(cls_method_context_t hctx, string& start_obj,
-                          string& filter_prefix, uint64_t max, map<string, bufferlist>* vals)
+int cls_cxx_map_read_keys(cls_method_context_t hctx, const string &start_obj,
+                          const string &filter_prefix, uint64_t max,
+                          map<string, bufferlist> *vals)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -327,7 +328,7 @@ int cls_cxx_map_read_header(cls_method_context_t hctx, bufferlist *outbl)
 
   return 0;
 }
-int cls_cxx_map_read_key(cls_method_context_t hctx, string key, bufferlist *outbl)
+int cls_cxx_map_read_key(cls_method_context_t hctx, const string &key, bufferlist *outbl)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -359,7 +360,7 @@ int cls_cxx_map_read_key(cls_method_context_t hctx, string key, bufferlist *outb
   return 0;
 }
 
-int cls_cxx_map_write_key(cls_method_context_t hctx, string key, bufferlist *inbl)
+int cls_cxx_map_write_key(cls_method_context_t hctx, const string &key, bufferlist *inbl)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -397,7 +398,7 @@ int cls_cxx_map_write_header(cls_method_context_t hctx, bufferlist *inbl)
   return (*pctx)->pg->do_osd_ops(*pctx, ops);
 }
 
-int cls_cxx_map_remove_key(cls_method_context_t hctx, string key)
+int cls_cxx_map_remove_key(cls_method_context_t hctx, const string &key)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);

diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h
index a4380e46aa5e805f9d7a22fd8dee7c360da1694b..f71de1eab61760e457e0dac8f95ce8ffedf9f2d9 100644 (file)
--- a/src/objclass/objclass.h
+++ b/src/objclass/objclass.h
@@ -98,14 +98,14 @@ extern int cls_cxx_replace(cls_method_context_t hctx, int ofs, int len, bufferli
 extern int cls_cxx_snap_revert(cls_method_context_t hctx, snapid_t snapid);
 extern int cls_cxx_map_clear(cls_method_context_t hctx);
 extern int cls_cxx_map_read_all_keys(cls_method_context_t hctx, std::map<string, bufferlist> *keys);
-extern int cls_cxx_map_read_keys(cls_method_context_t hctx, string& start_after, string& filter_prefix,
+extern int cls_cxx_map_read_keys(cls_method_context_t hctx, const string &start_after, const string &filter_prefix,
                                 uint64_t max, std::map<string, bufferlist> *keys);
 extern int cls_cxx_map_read_header(cls_method_context_t hctx, bufferlist *outbl);
-extern int cls_cxx_map_read_key(cls_method_context_t hctx, string key, bufferlist *outbl);
-extern int cls_cxx_map_write_key(cls_method_context_t hctx, string key, bufferlist *inbl);
+extern int cls_cxx_map_read_key(cls_method_context_t hctx, const string &key, bufferlist *outbl);
+extern int cls_cxx_map_write_key(cls_method_context_t hctx, const string &key, bufferlist *inbl);
 extern int cls_cxx_map_write_header(cls_method_context_t hctx, bufferlist *inbl);
-extern int cls_cxx_map_remove_key(cls_method_context_t hctx, string key);
-extern int cls_cxx_map_update(cls_method_context_t hctx, bufferlist* inbl);
+extern int cls_cxx_map_remove_key(cls_method_context_t hctx, const string &key);
+extern int cls_cxx_map_update(cls_method_context_t hctx, bufferlist *inbl);
 
 /* These are also defined in rados.h and librados.h. Keep them in sync! */
 #define CEPH_OSD_TMAP_HDR 'h'