#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include "pb_decode.h"
+#include <pb_decode.h>
+#include "person.h"
-/* Structures for "Person" message */
-
-typedef enum {
- Person_PhoneType_MOBILE = 0,
- Person_PhoneType_HOME = 1,
- Person_PhoneType_WORK = 2
-} Person_PhoneType;
-
-typedef struct {
- char number[40];
- bool has_type;
- Person_PhoneType type;
-} Person_PhoneNumber;
-
-typedef struct {
- char name[40];
- int32_t id;
- bool has_email;
- char email[40];
- size_t phone_size;
- Person_PhoneNumber phone[5];
-} Person;
-
-/* Field descriptions */
-#define membersize(st, m) (sizeof ((st*)0)->m)
-
-const Person_PhoneType Person_PhoneType_type_default = Person_PhoneType_HOME;
-
-const pb_field_t Person_PhoneNumber_fields[] = {
- {1, PB_HTYPE_REQUIRED | PB_LTYPE_STRING,
- offsetof(Person_PhoneNumber, number), 0,
- membersize(Person_PhoneNumber, number), 0, 0},
-
- {2, PB_HTYPE_OPTIONAL | PB_LTYPE_ENUM,
- offsetof(Person_PhoneNumber, type),
- offsetof(Person_PhoneNumber, has_type),
- membersize(Person_PhoneNumber, type), 0,
- &Person_PhoneType_type_default},
-
- PB_LAST_FIELD
-};
-
-const pb_field_t Person_fields[] = {
- {1, PB_HTYPE_REQUIRED | PB_LTYPE_STRING,
- offsetof(Person, name), 0,
- membersize(Person, name), 0, 0},
-
- {2, PB_HTYPE_REQUIRED | PB_LTYPE_INT32,
- offsetof(Person, id), 0,
- membersize(Person, id), 0, 0},
-
- {3, PB_HTYPE_OPTIONAL | PB_LTYPE_STRING,
- offsetof(Person, email),
- offsetof(Person, has_email),
- membersize(Person, email), 0, 0},
-
- {4, PB_HTYPE_ARRAY | PB_LTYPE_SUBMESSAGE,
- offsetof(Person, phone),
- offsetof(Person, phone_size),
- membersize(Person, phone[0]),
- membersize(Person, phone) / membersize(Person, phone[0]),
- Person_PhoneNumber_fields},
-
- PB_LAST_FIELD
-};
-
-/* And now, the actual test program */
+/* This test has only one source file anyway.. */
+#include "person.c"
bool print_person(pb_istream_t *stream)
{
printf("Person: name '%s' id '%d' email '%s'\n", person.name, person.id, person.email);
- for (i = 0; i < person.phone_size; i++)
+ for (i = 0; i < person.phone_count; i++)
{
Person_PhoneNumber *phone = &person.phone[i];
printf("PhoneNumber: number '%s' type '%d'\n", phone->number, phone->type);
return true;
}
-bool my_read(pb_istream_t *stream, char *buf, size_t count)
-{
- char *source = (char*)stream->state;
-
- if (!stream->bytes_left)
- return false;
-
- if (buf != NULL)
- {
- memcpy(buf, source, count);
- }
-
- stream->state = source + count;
- return true;
-}
-
int main()
{
uint8_t buffer[512];