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

Merge branch 'master' into dynamic_alloc_dev

Browse Source 
Conflicts:
	tests/Makefile
	tests/test_encode1.c
This commit is contained in:
Petteri Aimonen
2012-01-05 22:10:29 +02:00
parent accd93be8d 28aa0ce096
commit a2673f24fa
16 changed files with 1671 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/test_decode1.c
View File

@@ -23,7 +23,7 @@ bool print_person(pb_istream_t *stream)
/* Now the decoding is done, rest is just to print stuff out. */
printf("name: \"%s\"\n", person.name);
printf("id: %d\n", person.id);
printf("id: %ld\n", (long)person.id);
if (Person_has(person, email))
printf("email: \"%s\"\n", person.email);
@@ -34,19 +34,22 @@ bool print_person(pb_istream_t *stream)
printf("phone {\n");
printf(" number: \"%s\"\n", phone->number);
switch (phone->type)
if (Person_PhoneNumber_has(*phone, type))
{
case Person_PhoneType_WORK:
printf(" type: WORK\n");
break;
case Person_PhoneType_HOME:
printf(" type: HOME\n");
break;
case Person_PhoneType_MOBILE:
printf(" type: MOBILE\n");
break;
switch (phone->type)
{
case Person_PhoneType_WORK:
printf(" type: WORK\n");
break;
case Person_PhoneType_HOME:
printf(" type: HOME\n");
break;
case Person_PhoneType_MOBILE:
printf(" type: MOBILE\n");
break;
}
}
printf("}\n");
}
@@ -54,33 +57,16 @@ bool print_person(pb_istream_t *stream)
return true;
}
/* This binds the pb_istream_t to stdin */
bool callback(pb_istream_t *stream, uint8_t *buf, size_t count)
{
FILE *file = (FILE*)stream->state;
bool status;
if (buf == NULL)
{
/* Skipping data */
while (count-- && fgetc(file) != EOF);
return count == 0;
}
status = (fread(buf, 1, count, file) == count);
if (feof(file))
stream->bytes_left = 0;
return status;
}
int main()
{
/* Maximum size is specified to prevent infinite length messages from
* hanging this in the fuzz test.
*/
pb_istream_t stream = {&callback, stdin, 10000};
/* Read the data into buffer */
uint8_t buffer[512];
size_t count = fread(buffer, 1, sizeof(buffer), stdin);
/* Construct a pb_istream_t for reading from the buffer */
pb_istream_t stream = pb_istream_from_buffer(buffer, count);
/* Decode and print out the stuff */
if (!print_person(&stream))
{
printf("Parsing failed.\n");