From: Piotr Dałek <piotr.dalek@corp.ovh.com>
Date: Fri, 28 Jul 2017 08:08:29 +0000 (+0200)
Subject: class_api.cc: kill implicit string conversion
X-Git-Tag: v13.0.0~146^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e765dc37c83a93ec91e21cfd2b2dafb43c298da1;p=ceph-ci.git

class_api.cc: kill implicit string conversion

This gets rid of implicit c-string to std::string conversions, as
they are expensive and unnecessary anyway.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
---

diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc
index 724842c1cb1..e955cc0d429 100644
--- a/src/objclass/class_api.cc
+++ b/src/objclass/class_api.cc
@@ -142,8 +142,8 @@ int cls_getxattr(cls_method_context_t hctx, const char *name,
   int r;
 
   op.op.op = CEPH_OSD_OP_GETXATTR;
-  op.indata.append(name);
   op.op.xattr.name_len = strlen(name);
+  op.indata.append(name, op.op.xattr.name_len);
   r = (*pctx)->pg->do_osd_ops(*pctx, nops);
   if (r < 0)
     return r;
@@ -167,10 +167,10 @@ int cls_setxattr(cls_method_context_t hctx, const char *name,
   int r;
 
   op.op.op = CEPH_OSD_OP_SETXATTR;
-  op.indata.append(name);
-  op.indata.append(value);
   op.op.xattr.name_len = strlen(name);
   op.op.xattr.value_len = val_len;
+  op.indata.append(name, op.op.xattr.name_len);
+  op.indata.append(value, val_len);
   r = (*pctx)->pg->do_osd_ops(*pctx, nops);
 
   return r;
@@ -346,8 +346,8 @@ int cls_cxx_getxattr(cls_method_context_t hctx, const char *name,
   int r;
 
   op.op.op = CEPH_OSD_OP_GETXATTR;
-  op.indata.append(name);
   op.op.xattr.name_len = strlen(name);
+  op.indata.append(name, op.op.xattr.name_len);
   r = (*pctx)->pg->do_osd_ops(*pctx, nops);
   if (r < 0)
     return r;
@@ -387,10 +387,10 @@ int cls_cxx_setxattr(cls_method_context_t hctx, const char *name,
   int r;
 
   op.op.op = CEPH_OSD_OP_SETXATTR;
-  op.indata.append(name);
-  op.indata.append(*inbl);
   op.op.xattr.name_len = strlen(name);
   op.op.xattr.value_len = inbl->length();
+  op.indata.append(name, op.op.xattr.name_len);
+  op.indata.append(*inbl);
   r = (*pctx)->pg->do_osd_ops(*pctx, nops);
 
   return r;