static bool checkreturn buf_write(pb_ostream_t *stream, const uint8_t *buf, size_t count)
{
uint8_t *dest = (uint8_t*)stream->state;
- memcpy(dest, buf, count);
stream->state = dest + count;
+
+ while (count--)
+ *dest++ = *buf++;
+
return true;
}
pb_ostream_t pb_ostream_from_buffer(uint8_t *buf, size_t bufsize)
{
pb_ostream_t stream;
+#ifdef PB_BUFFER_ONLY
+ stream.callback = (void*)1; /* Just some marker value */
+#else
stream.callback = &buf_write;
+#endif
stream.state = buf;
stream.max_size = bufsize;
stream.bytes_written = 0;
{
if (stream->bytes_written + count > stream->max_size)
return false;
-
+
+#ifdef PB_BUFFER_ONLY
+ if (!buf_write(stream, buf, count))
+ return false;
+#else
if (!stream->callback(stream, buf, count))
return false;
+#endif
}
stream->bytes_written += count;
return true;
}
+bool checkreturn encode_static_field(pb_ostream_t *stream, const pb_field_t *field, const void *pData)
+{
+ pb_encoder_t func;
+ const void *pSize;
+
+ func = PB_ENCODERS[PB_LTYPE(field->type)];
+ pSize = (const char*)pData + field->size_offset;
+
+ switch (PB_HTYPE(field->type))
+ {
+ case PB_HTYPE_REQUIRED:
+ if (!pb_encode_tag_for_field(stream, field))
+ return false;
+ if (!func(stream, field, pData))
+ return false;
+ break;
+
+ case PB_HTYPE_OPTIONAL:
+ if (*(const bool*)pSize)
+ {
+ if (!pb_encode_tag_for_field(stream, field))
+ return false;
+
+ if (!func(stream, field, pData))
+ return false;
+ }
+ break;
+
+ case PB_HTYPE_REPEATED:
+ if (!encode_array(stream, field, pData, *(const size_t*)pSize, func))
+ return false;
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool checkreturn encode_callback_field(pb_ostream_t *stream, const pb_field_t *field, const void *pData)
+{
+ const pb_callback_t *callback = (const pb_callback_t*)pData;
+ if (callback->funcs.encode != NULL)
+ {
+ if (!callback->funcs.encode(stream, field, callback->arg))
+ return false;
+ }
+ return true;
+}
+
bool checkreturn pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct)
{
const pb_field_t *field = fields;
const void *pData = src_struct;
- const void *pSize;
size_t prev_size = 0;
while (field->tag != 0)
{
- pb_encoder_t func = PB_ENCODERS[PB_LTYPE(field->type)];
pData = (const char*)pData + prev_size + field->data_offset;
- pSize = (const char*)pData + field->size_offset;
-
prev_size = field->data_size;
- if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
+
+ /* Special case for static arrays */
+ if (PB_ATYPE(field->type) == PB_ATYPE_STATIC &&
+ PB_HTYPE(field->type) == PB_HTYPE_REPEATED)
+ {
prev_size *= field->array_size;
+ }
- switch (PB_HTYPE(field->type))
+ switch (PB_ATYPE(field->type))
{
- case PB_HTYPE_REQUIRED:
- if (!pb_encode_tag_for_field(stream, field))
- return false;
- if (!func(stream, field, pData))
+ case PB_ATYPE_STATIC:
+ if (!encode_static_field(stream, field, pData))
return false;
break;
- case PB_HTYPE_OPTIONAL:
- if (*(bool*)pSize)
- {
- if (!pb_encode_tag_for_field(stream, field))
- return false;
-
- if (!func(stream, field, pData))
- return false;
- }
- break;
-
- case PB_HTYPE_ARRAY:
- if (!encode_array(stream, field, pData, *(size_t*)pSize, func))
+ case PB_ATYPE_CALLBACK:
+ if (!encode_callback_field(stream, field, pData))
return false;
break;
- case PB_HTYPE_CALLBACK:
- {
- pb_callback_t *callback = (pb_callback_t*)pData;
- if (callback->funcs.encode != NULL)
- {
- if (!callback->funcs.encode(stream, field, callback->arg))
- return false;
- }
- break;
- }
+ default:
+ return false;
}
field++;
bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
{
uint8_t buffer[10];
- int i = 0;
+ size_t i = 0;
if (value == 0)
return pb_write(stream, (uint8_t*)&value, 1);
{
uint64_t zigzagged;
if (value < 0)
- zigzagged = ~(value << 1);
+ zigzagged = (uint64_t)(~(value << 1));
else
- zigzagged = value << 1;
+ zigzagged = (uint64_t)(value << 1);
return pb_encode_varint(stream, zigzagged);
}
lebytes[3] = bytes[0];
return pb_write(stream, lebytes, 4);
#else
- return pb_write(stream, (uint8_t*)value, 4);
+ return pb_write(stream, (const uint8_t*)value, 4);
#endif
}
lebytes[7] = bytes[0];
return pb_write(stream, lebytes, 8);
#else
- return pb_write(stream, (uint8_t*)value, 8);
+ return pb_write(stream, (const uint8_t*)value, 8);
#endif
}
-bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number)
+bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number)
{
- int tag = wiretype | (field_number << 3);
- return pb_encode_varint(stream, (uint64_t)tag);
+ uint64_t tag = wiretype | (field_number << 3);
+ return pb_encode_varint(stream, tag);
}
bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field)
switch (field->data_size)
{
- case 1: value = *(uint8_t*)src; break;
- case 2: value = *(uint16_t*)src; break;
- case 4: value = *(uint32_t*)src; break;
- case 8: value = *(uint64_t*)src; break;
+ case 1: value = *(const uint8_t*)src; break;
+ case 2: value = *(const uint16_t*)src; break;
+ case 4: value = *(const uint32_t*)src; break;
+ case 8: value = *(const uint64_t*)src; break;
default: return false;
}
bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
- uint64_t value = 0;
+ int64_t value = 0;
switch (field->data_size)
{
- case 4: value = *(int32_t*)src; break;
- case 8: value = *(int64_t*)src; break;
+ case 4: value = *(const int32_t*)src; break;
+ case 8: value = *(const int64_t*)src; break;
default: return false;
}
bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
- pb_bytes_array_t *bytes = (pb_bytes_array_t*)src;
+ const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
UNUSED(field);
return pb_encode_string(stream, bytes->bytes, bytes->size);
}
bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
UNUSED(field);
- return pb_encode_string(stream, (uint8_t*)src, strlen((char*)src));
+ return pb_encode_string(stream, (const uint8_t*)src, strlen((const char*)src));
}
bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
if (field->ptr == NULL)
return false;
- return pb_encode_submessage(stream, (pb_field_t*)field->ptr, src);
+ return pb_encode_submessage(stream, (const pb_field_t*)field->ptr, src);
}