commit 8ca136952dfcb5d5e21dd2947c98a9326190dce6
author Laurence Lundblade <lgl@island-resort.com> Tue Dec 04 14:35:53 2018 +0900
committer Laurence Lundblade <lgl@island-resort.com> Tue Dec 04 14:35:53 2018 +0900
tree 25a87ded126bd252f1570617a83e0b986f88bd39
parent 88b6eceb4e3ca33168e54dfc415072520978918a

stop using printf to output the data structure sizes

cmd_line_main.c

diff --git a/cmd_line_main.c b/cmd_line_main.c
index 9735b9b..4357d07 100644
--- a/cmd_line_main.c
+++ b/cmd_line_main.c
@@ -43,16 +43,28 @@
 }
 
 
+static void PrintSize(const char *szWhat, uint32_t uSize)
+{
+    UsefulBuf_MAKE_STACK_UB(foo, 20);
+    
+    fputs_wrapper(szWhat, stdout);
+    fputs_wrapper(" ", stdout);
+    fputs_wrapper(NumToString(uSize,foo), stdout);
+    fputs_wrapper("\n", stdout);
+}
+
+
 int main(int argc, const char * argv[])
 {
     // Type and size of return from sizeof() varies. These will never be large so cast is safe
-    // TODO: use fputs_wrapper to output these
-    printf("sizeof(QCBORTrackNesting) %d\n", (uint32_t)sizeof(QCBORTrackNesting));
-    printf("sizeof(QCBOREncodeContext) %d\n", (uint32_t)sizeof(QCBOREncodeContext));
-    printf("sizeof(QCBORDecodeContext) %d\n", (uint32_t)sizeof(QCBORDecodeContext));
-    printf("sizeof(QCBORDecodeNesting) %d\n", (uint32_t)sizeof(QCBORDecodeNesting));
-    printf("sizeof(QCBORItem) %d\n", (uint32_t)sizeof(QCBORItem));
-    printf("sizeof(QCBORStringAllocator) %d\n\n", (uint32_t)sizeof(QCBORStringAllocator));
+    PrintSize("sizeof(QCBORTrackNesting)", (uint32_t)sizeof(QCBORTrackNesting));
+    PrintSize("sizeof(QCBORTrackNesting)", (uint32_t)sizeof(QCBORTrackNesting));
+    PrintSize("sizeof(QCBOREncodeContext)", (uint32_t)sizeof(QCBOREncodeContext));
+    PrintSize("sizeof(QCBORDecodeContext)", (uint32_t)sizeof(QCBORDecodeContext));
+    PrintSize("sizeof(QCBORDecodeNesting)", (uint32_t)sizeof(QCBORDecodeNesting));
+    PrintSize("sizeof(QCBORItem)", (uint32_t)sizeof(QCBORItem));
+    PrintSize("sizeof(QCBORStringAllocator)", (uint32_t)sizeof(QCBORStringAllocator));
+    fputs_wrapper("\n", stdout);
 
     int nNumTestsFailed = 0;
     

test/run_tests.h

diff --git a/test/run_tests.h b/test/run_tests.h
index 3170a33..498554e 100644
--- a/test/run_tests.h
+++ b/test/run_tests.h
@@ -34,3 +34,10 @@
 typedef int (*outputstring)(const char *szString, void *ctx);
 
 int run_tests(const char *szTestName, outputstring output, void *poutCtx, int *pNumTestsRun);
+
+
+#include <stdint.h>
+#include "UsefulBuf.h"
+
+const char *NumToString(int32_t nNum, UsefulBuf StringMem);
+