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

Const-correctness and small cleanup.

Browse Source
This commit is contained in:
Petteri Aimonen
2013-12-09 19:15:26 +02:00
parent 03d4a7c916
commit 6ddb051563
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pb_encode.c
View File

@@ -171,11 +171,14 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
if (!pb_encode_tag_for_field(stream, field)) if (!pb_encode_tag_for_field(stream, field))
return false; return false;
/* Special case for strings */ /* Normally the data is stored directly in the array entries, but
* for pointer-type string fields, the array entries are actually
* string pointers. So we have to dereference once more to get to
* the character data. */
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER && if (PB_ATYPE(field->type) == PB_ATYPE_POINTER &&
PB_LTYPE(field->type) == PB_LTYPE_STRING) PB_LTYPE(field->type) == PB_LTYPE_STRING)
{ {
if (!func(stream, field, *(const void**)p)) if (!func(stream, field, *(const void* const*)p))
return false; return false;
} }
else else
@@ -197,19 +200,25 @@ static bool checkreturn encode_static_field(pb_ostream_t *stream,
{ {
pb_encoder_t func; pb_encoder_t func;
const void *pSize; const void *pSize;
bool dummy = true; bool implicit_has = true;
func = PB_ENCODERS[PB_LTYPE(field->type)]; func = PB_ENCODERS[PB_LTYPE(field->type)];
if (field->size_offset) if (field->size_offset)
pSize = (const char*)pData + field->size_offset; pSize = (const char*)pData + field->size_offset;
else if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
pSize = *(const void**)pData ? &dummy : pData;
else else
pSize = &dummy; pSize = &implicit_has;
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER) if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
pData = *(const void**)pData; {
/* pData is a pointer to the field, which contains pointer to
* the data. If the 2nd pointer is NULL, it is interpreted as if
* the has_field was false.
*/
pData = *(const void* const*)pData;
implicit_has = (pData != NULL);
}
switch (PB_HTYPE(field->type)) switch (PB_HTYPE(field->type))
{ {
@@ -587,25 +596,20 @@ bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, con
bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src) bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{ {
/* strnlen() is not always available, so just use a for-loop */ /* strnlen() is not always available, so just use a loop */
size_t size = 0; size_t size = 0;
size_t max_size = field->data_size;
const char *p = (const char*)src; const char *p = (const char*)src;
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER) if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
{ max_size = (size_t)-1;
while (*p != '\0')
while (size < max_size && *p != '\0')
{ {
size++; size++;
p++; p++;
} }
}
else
{
while (size < field->data_size && *p != '\0')
{
size++;
p++;
}
}
return pb_encode_string(stream, (const uint8_t*)src, size); return pb_encode_string(stream, (const uint8_t*)src, size);
} }