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

Remove the PB_ENCODERS array.

Browse Source
This commit is contained in:
Petteri Aimonen
2013-11-14 19:36:53 +02:00
parent 97210c91a9
commit 17c10119dd
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pb_decode.c
View File

@@ -39,6 +39,7 @@ static bool checkreturn read_raw_value(pb_istream_t *stream, pb_wire_type_t wire
static void pb_field_init(pb_field_iterator_t *iter, const pb_field_t *fields, void *dest_struct);
static bool pb_field_next(pb_field_iterator_t *iter);
static bool checkreturn pb_field_find(pb_field_iterator_t *iter, uint32_t tag);
static bool checkreturn decode_ltype(pb_istream_t *stream, const pb_field_t *field, void *dest, pb_type_t type);
static bool checkreturn decode_static_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iterator_t *iter);
static bool checkreturn decode_callback_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iterator_t *iter);
static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iterator_t *iter);
@@ -394,7 +395,7 @@ static bool checkreturn decode_ltype(pb_istream_t *stream,
case PB_LTYPE_STRING: return pb_dec_string(stream, field, dest);
case PB_LTYPE_SUBMESSAGE: return pb_dec_submessage(stream, field, dest);
default: PB_RETURN_ERROR(stream, "invalid LTYPE");
default: PB_RETURN_ERROR(stream, "invalid field type");
}
}

56
pb_encode.c
View File

@@ -20,10 +20,9 @@
/**************************************
* Declarations internal to this file *
**************************************/
typedef bool (*pb_encoder_t)(pb_ostream_t *stream, const pb_field_t *field, const void *src) checkreturn;
static bool checkreturn buf_write(pb_ostream_t *stream, const uint8_t *buf, size_t count);
static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *field, const void *pData, size_t count, pb_encoder_t func);
static bool checkreturn encode_ltype(pb_ostream_t *stream, const pb_field_t *field, const void *src, pb_type_t type);
static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *field, const void *pData, size_t count);
static bool checkreturn encode_field(pb_ostream_t *stream, const pb_field_t *field, const void *pData);
static bool checkreturn default_extension_encoder(pb_ostream_t *stream, const pb_extension_t *extension);
static bool checkreturn encode_extension_field(pb_ostream_t *stream, const pb_field_t *field, const void *pData);
@@ -35,21 +34,6 @@ static bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *fie
static bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src);
static bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
/* --- Function pointers to field encoders ---
* Order in the array must match pb_action_t LTYPE numbering.
*/
static const pb_encoder_t PB_ENCODERS[PB_LTYPES_COUNT] = {
&pb_enc_varint,
&pb_enc_svarint,
&pb_enc_fixed32,
&pb_enc_fixed64,
&pb_enc_bytes,
&pb_enc_string,
&pb_enc_submessage,
NULL /* extensions */
};
/*******************************
* pb_ostream_t implementation *
*******************************/
@@ -106,9 +90,28 @@ bool checkreturn pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count
* Encode a single field *
*************************/
/* Invoke an encoder function based on the ltype of a field. */
static bool checkreturn encode_ltype(pb_ostream_t *stream,
const pb_field_t *field, const void *src, pb_type_t type)
{
switch (PB_LTYPE(type))
{
case PB_LTYPE_VARINT: return pb_enc_varint(stream, field, src);
case PB_LTYPE_SVARINT: return pb_enc_svarint(stream, field, src);
case PB_LTYPE_FIXED32: return pb_enc_fixed32(stream, field, src);
case PB_LTYPE_FIXED64: return pb_enc_fixed64(stream, field, src);
case PB_LTYPE_BYTES: return pb_enc_bytes(stream, field, src);
case PB_LTYPE_STRING: return pb_enc_string(stream, field, src);
case PB_LTYPE_SUBMESSAGE: return pb_enc_submessage(stream, field, src);
default: PB_RETURN_ERROR(stream, "invalid field type");
}
}
/* Encode a static array. Handles the size calculations and possible packing. */
static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *field,
const void *pData, size_t count, pb_encoder_t func)
const void *pData, size_t count)
{
size_t i;
const void *p;
@@ -141,7 +144,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
p = pData;
for (i = 0; i < count; i++)
{
if (!func(&sizestream, field, p))
if (!encode_ltype(&sizestream, field, p, field->type))
return false;
p = (const char*)p + field->data_size;
}
@@ -158,7 +161,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
p = pData;
for (i = 0; i < count; i++)
{
if (!func(stream, field, p))
if (!encode_ltype(stream, field, p, field->type))
return false;
p = (const char*)p + field->data_size;
}
@@ -170,7 +173,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
{
if (!pb_encode_tag_for_field(stream, field))
return false;
if (!func(stream, field, p))
if (!encode_ltype(stream, field, p, field->type))
return false;
p = (const char*)p + field->data_size;
}
@@ -184,12 +187,9 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
static bool checkreturn encode_static_field(pb_ostream_t *stream,
const pb_field_t *field, const void *pData)
{
pb_encoder_t func;
const void *pSize;
bool dummy = true;
func = PB_ENCODERS[PB_LTYPE(field->type)];
if (field->size_offset)
pSize = (const char*)pData + field->size_offset;
else
@@ -200,7 +200,7 @@ static bool checkreturn encode_static_field(pb_ostream_t *stream,
case PB_HTYPE_REQUIRED:
if (!pb_encode_tag_for_field(stream, field))
return false;
if (!func(stream, field, pData))
if (!encode_ltype(stream, field, pData, field->type))
return false;
break;
@@ -210,13 +210,13 @@ static bool checkreturn encode_static_field(pb_ostream_t *stream,
if (!pb_encode_tag_for_field(stream, field))
return false;
if (!func(stream, field, pData))
if (!encode_ltype(stream, field, pData, field->type))
return false;
}
break;
case PB_HTYPE_REPEATED:
if (!encode_array(stream, field, pData, *(const size_t*)pSize, func))
if (!encode_array(stream, field, pData, *(const size_t*)pSize))
return false;
break;