commit 07e0ca930c29757217c2f9e4e0e6954657b6b82d
author Behdad Esfahbod <behdad@behdad.org> Thu Sep 13 17:39:09 2018 +0200
committer Behdad Esfahbod <behdad@behdad.org> Thu Sep 13 17:39:51 2018 +0200
tree 6968c9578d0147763f95794a7648ea2e415f2dbb
parent dbb764dceb61365b7360a48d581ba5a4b3526e98

[bytes] Rename content to arrayZ

src/hb-dsalgs.hh

diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh
index 26e8e42..692002e 100644
--- a/src/hb-dsalgs.hh
+++ b/src/hb-dsalgs.hh
@@ -529,18 +529,18 @@
 
 struct hb_bytes_t
 {
-  inline hb_bytes_t (void) : bytes (nullptr), len (0) {}
-  inline hb_bytes_t (const char *bytes_, unsigned int len_) : bytes (bytes_), len (len_) {}
-  inline hb_bytes_t (const void *bytes_, unsigned int len_) : bytes ((const char *) bytes_), len (len_) {}
+  inline hb_bytes_t (void) : arrayZ (nullptr), len (0) {}
+  inline hb_bytes_t (const char *bytes_, unsigned int len_) : arrayZ (bytes_), len (len_) {}
+  inline hb_bytes_t (const void *bytes_, unsigned int len_) : arrayZ ((const char *) bytes_), len (len_) {}
   template <typename T>
-  inline hb_bytes_t (const T& array) : bytes ((const char *) array.arrayZ), len (array.len) {}
+  inline hb_bytes_t (const T& array) : arrayZ ((const char *) array.arrayZ), len (array.len) {}
 
-  inline void free (void) { ::free ((void *) bytes); bytes = nullptr; len = 0; }
+  inline void free (void) { ::free ((void *) arrayZ); arrayZ = nullptr; len = 0; }
 
   template <typename Type>
   inline const Type* as (void) const
   {
-    return unlikely (!bytes) ? &Null(Type) : reinterpret_cast<const Type *> (bytes);
+    return unlikely (!arrayZ) ? &Null(Type) : reinterpret_cast<const Type *> (arrayZ);
   }
 
   inline int cmp (const hb_bytes_t &a) const
@@ -548,7 +548,7 @@
     if (len != a.len)
       return (int) a.len - (int) len;
 
-    return memcmp (a.bytes, bytes, len);
+    return memcmp (a.arrayZ, arrayZ, len);
   }
   static inline int cmp (const void *pa, const void *pb)
   {
@@ -557,7 +557,7 @@
     return b->cmp (*a);
   }
 
-  const char *bytes;
+  const char *arrayZ;
   unsigned int len;
 };
 

src/hb-ot-post-table.hh

diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh
index 29dc86f..5f27fd5 100644
--- a/src/hb-ot-post-table.hh
+++ b/src/hb-ot-post-table.hh
@@ -143,7 +143,7 @@
 	return true;
       if (buf_len <= s.len) /* What to do with truncation? Returning false for now. */
         return false;
-      strncpy (buf, s.bytes, s.len);
+      strncpy (buf, s.arrayZ, s.len);
       buf[s.len] = '\0';
       return true;
     }