Documenting and improving stream behaviour

git-svn-id: https://svn.kapsi.fi/jpa/nanopb@954 e3a754e5-d11d-0410-8d38-ebb782a927b9
This commit is contained in:
Petteri Aimonen
2011-08-11 19:22:36 +00:00
parent 09f92bafa5
commit 6dfba365b0
10 changed files with 193 additions and 21 deletions

View File

@@ -24,12 +24,28 @@ bool print_person(pb_istream_t *stream)
return true;
}
bool callback(pb_istream_t *stream, uint8_t *buf, size_t count)
{
FILE *file = (FILE*)stream->state;
bool status;
if (buf == NULL)
{
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()
{
uint8_t buffer[512];
size_t size = fread(buffer, 1, 512, stdin);
pb_istream_t stream = pb_istream_from_buffer(buffer, size);
pb_istream_t stream = {&callback, stdin, SIZE_MAX};
if (!print_person(&stream))
printf("Parsing failed.\n");

View File

@@ -5,9 +5,10 @@
/* This test has only one source file anyway.. */
#include "person.c"
bool callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
bool streamcallback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
{
return fwrite(buf, 1, count, stdout) == count;
FILE *file = (FILE*) stream->state;
return fwrite(buf, 1, count, file) == count;
}
int main()
@@ -15,7 +16,7 @@ int main()
Person person = {"Test Person 99", 99, true, "test@person.com",
1, {{"555-12345678", true, Person_PhoneType_MOBILE}}};
pb_ostream_t stream = {&callback, 0, SIZE_MAX, 0};
pb_ostream_t stream = {&streamcallback, stdout, SIZE_MAX, 0};
pb_encode(&stream, Person_fields, &person);