X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftest_decode1.c;h=a2c7f4281a48bdd3fa4b6f79d0fe706d0ea0b323;hb=6dfba365b00175eae7e8b83aaf5d29ce190fd9eb;hp=20ea65e44240bf548bfaf7bd958e3e9cb79cff86;hpb=ead3b734d8f96837ea6564b694df5618134e3cf8;p=apps%2Flow-level-can-service.git

diff --git a/tests/test_decode1.c b/tests/test_decode1.c
index 20ea65e..a2c7f42 100644
--- a/tests/test_decode1.c
+++ b/tests/test_decode1.c
@@ -1,75 +1,9 @@
 #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)
 {
@@ -81,7 +15,7 @@ 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);
@@ -90,28 +24,28 @@ bool print_person(pb_istream_t *stream)
     return true;
 }
 
-bool my_read(pb_istream_t *stream, char *buf, size_t count)
+bool callback(pb_istream_t *stream, uint8_t *buf, size_t count)
 {
-    char *source = (char*)stream->state;
-    
-    if (!stream->bytes_left)
-        return false;
+    FILE *file = (FILE*)stream->state;
+    bool status;
     
-    if (buf != NULL)
+    if (buf == NULL)
     {
-        memcpy(buf, source, count);
+        while (count-- && fgetc(file) != EOF);
+        return count == 0;
     }
     
-    stream->state = source + count;
-    return true;
+    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");