libpurple/protocols/gg/lib/protobuf-c.c

branch
release-2.x.y
changeset 35685
703d7d7bdf60
parent 35650
f4232b1c3263
child 35686
cae91a875b23
child 36169
1a8a6a18e76e
--- a/libpurple/protocols/gg/lib/protobuf-c.c	Tue Apr 01 00:00:26 2014 +0200
+++ b/libpurple/protocols/gg/lib/protobuf-c.c	Thu Apr 03 14:48:56 2014 +0200
@@ -919,7 +919,7 @@
                      const void *member,
                      uint8_t *out)
 {
-  char *array = * (char * const *) member;
+  void *array = * (char * const *) member;
   unsigned i;
   if (field->packed)
     {
@@ -1024,7 +1024,7 @@
       for (i = 0; i < count; i++)
         {
           rv += required_field_pack (field, array, out + rv);
-          array += siz;
+          array = ((char*)array) + siz;
         }
       return rv;
     }
@@ -1902,7 +1902,7 @@
   const ProtobufCFieldDescriptor *field = scanned_member->field;
   size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
   size_t siz = sizeof_elt_in_repeated_array (field->type);
-  char *array = *(char**)member + siz * (*p_n);
+  void *array = *(char**)member + siz * (*p_n);
   const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
   size_t rem = scanned_member->len - scanned_member->length_prefix_len;
   size_t count = 0;

mercurial