rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organize allocation logic in generator, add pb_bytes_ptr_t.

Browse Source 
Allocation decision is now made before the field data type is decided.
This way the data type decisions can more cleanly account for the allocation
type, i.e. FT_DEFAULT logic etc.

Added pb_bytes_ptr_t for pointer-allocated bytes-fields. There is no point
generating separate structs for these, as they would all be of the same type.
This commit is contained in:
Petteri Aimonen
2013-12-09 19:19:12 +02:00
parent 414e637867
commit 25516b0591
4 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pb_encode.c
View File

@@ -598,14 +598,14 @@ bool checkreturn pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, c
bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
{
return pb_encode_string(stream, *(const uint8_t**)bytes->bytes, bytes->size);
const pb_bytes_ptr_t *bytes = (const pb_bytes_ptr_t*)src;
return pb_encode_string(stream, bytes->bytes, bytes->size);
}
else
{
const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
if (bytes->size + offsetof(pb_bytes_array_t, bytes) > field->data_size)
PB_RETURN_ERROR(stream, "bytes size exceeded");