From: John Spray <john.spray@redhat.com>
Date: Wed, 28 Jun 2017 13:27:07 +0000 (-0400)
Subject: encoding: remove encode_array_nohead
X-Git-Tag: v12.1.2~196^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2350d2aded7101cf8ba60af0de7cbf0df8ef964b;p=ceph.git

encoding: remove encode_array_nohead

This was just a for loop.  No longer needed for
MonCommands, and the usage in memstore/PageSet
was just iterating over char* and should never have
been there to begin with.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/include/encoding.h b/src/include/encoding.h
index 0013728efed9..f7ee5d118285 100644
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -197,22 +197,6 @@ inline void encode(const char *s, bufferlist& bl)
 }
 
 
-// array
-template<class A>
-inline void encode_array_nohead(const A a[], int n, bufferlist &bl)
-{
-  for (int i=0; i<n; i++)
-    encode(a[i], bl);
-}
-template<class A>
-inline void decode_array_nohead(A a[], int n, bufferlist::iterator &p)
-{
-  for (int i=0; i<n; i++)
-    decode(a[i], p);
-}
-
-
-
 // -----------------------------
 // buffers
 
diff --git a/src/os/memstore/PageSet.h b/src/os/memstore/PageSet.h
index e989a3610722..a40b86425ec1 100644
--- a/src/os/memstore/PageSet.h
+++ b/src/os/memstore/PageSet.h
@@ -58,7 +58,7 @@ struct Page {
     ::encode(offset, bl);
   }
   void decode(bufferlist::iterator &p, size_t page_size) {
-    ::decode_array_nohead(data, page_size, p);
+    p.copy(page_size, data);
     ::decode(offset, p);
   }