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

Switch pb_encode to use the common iterator logic in pb_common.c

Browse Source 
Update issue 128
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2014-08-10 13:01:09 +03:00
parent a641e21b34
commit 7edf250a62
5 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pb_common.c
View File

@@ -5,7 +5,7 @@
#include "pb_common.h"
void pb_field_iter_begin(pb_field_iter_t *iter, const pb_field_t *fields, void *dest_struct)
bool pb_field_iter_begin(pb_field_iter_t *iter, const pb_field_t *fields, void *dest_struct)
{
iter->start = fields;
iter->pos = fields;
@@ -13,6 +13,8 @@ void pb_field_iter_begin(pb_field_iter_t *iter, const pb_field_t *fields, void *
iter->dest_struct = dest_struct;
iter->pData = (char*)dest_struct + iter->pos->data_offset;
iter->pSize = (char*)iter->pData + iter->pos->size_offset;
return (iter->pos->tag != 0);
}
bool pb_field_iter_next(pb_field_iter_t *iter)
@@ -31,7 +33,7 @@ bool pb_field_iter_next(pb_field_iter_t *iter)
if (iter->pos->tag == 0)
{
/* Wrapped back to beginning, reinitialize */
pb_field_iter_begin(iter, iter->start, iter->dest_struct);
(void)pb_field_iter_begin(iter, iter->start, iter->dest_struct);
return false;
}
else