Merged 0003-Fixed-format-specifiers.patch by Matt Kern.

[apps/agl-service-can-low-level.git] / tests / test_encode1.c

diff --git a/tests/test_encode1.c b/tests/test_encode1.c
index b4998f4..f46e60a 100644 (file)
--- a/tests/test_encode1.c
+++ b/tests/test_encode1.c
@@ -1,23 +1,31 @@
+/* A very simple encoding test case using person.proto.
+ * Just puts constant data in the fields and writes the
+ * data to stdout.
+ */
+
 #include <stdio.h>
 #include <pb_encode.h>
-#include "person.h"
-
-/* This test has only one source file anyway.. */
-#include "person.c"
+#include "person.pb.h"
 
-bool callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
+/* This binds the pb_ostream_t into the stdout stream */
+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()
 {
+    /* Initialize the structure with constants */
     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_encode(&stream, Person_fields, &person);
+    /* Prepare the stream, output goes directly to stdout */
+    pb_ostream_t stream = {&streamcallback, stdout, SIZE_MAX, 0};
     
-    return 0;
+    /* Now encode it and check if we succeeded. */
+    if (pb_encode(&stream, Person_fields, &person))
+        return 0; /* Success */
+    else
+        return 1; /* Failure */
 }