Add support for binary specs, many other changes

Author: suhas-pai

Makefile

@@ -1,4 +1,4 @@
-CC=clang
+CC?=clang
 
 SRCS=parse_printf.c example.c test.c
 OBJS=$(SRCS:.c=.o)
@@ -42,7 +42,7 @@ $(DEBUG_TARGET): $(DEBUG_OBJS)
 	@$(CC) $(DEBUG_CFLAGS) -c $< -o $@
 
 compile_commands: clean
-	@bear -- make
+	compiledb make
 
 print_info:
 	@echo $(OBJS)

example.c

@@ -1,48 +1,50 @@
+#include <string.h>
+
 #include "example.h"
 #include "parse_printf.h"
 
 struct callback_info {
     char *buffer_in;
-    uint64_t buffer_used;
-    uint64_t buffer_size;
+    uint32_t buffer_used;
+    uint32_t buffer_size;
 };
 
-uint64_t
+uint32_t
 format_to_buffer(char *const buffer_in,
-                 const uint64_t buffer_len,
+                 const uint32_t buffer_len,
                  const char *const format,
                  ...)
 {
     va_list list;
     va_start(list, format);
 
-    const uint64_t result =
+    const uint32_t result =
         vformat_to_buffer(buffer_in, buffer_len, format, list);
 
     va_end(list);
     return result;
 }
 
-static uint64_t
+static uint32_t
 format_to_buffer_write_ch_callback(
-    const struct printf_spec_info *const spec_info,
+    struct printf_spec_info *const spec_info,
     void *const info,
     const char ch,
-    uint64_t amount,
+    uint32_t amount,
     bool *const should_continue_out)
 {
     (void)spec_info;
 
     struct callback_info *const cb_info = (struct callback_info *)info;
-    const uint64_t old_used = cb_info->buffer_used;
+    const uint32_t old_used = cb_info->buffer_used;
 
-    uint64_t new_used = old_used;
+    uint32_t new_used = old_used;
     if (__builtin_add_overflow(new_used, amount, &new_used)) {
         *should_continue_out = false;
         return 0;
     }
 
-    const uint64_t buffer_size = cb_info->buffer_size;
+    const uint32_t buffer_size = cb_info->buffer_size;
     if (new_used >= buffer_size) {
         /*
          * Truncate amount to just the space left if we don't have enough space
@@ -61,27 +63,27 @@ format_to_buffer_write_ch_callback(
     return amount;
 }
 
-static uint64_t
+static uint32_t
 format_to_buffer_write_string_callback(
-    const struct printf_spec_info *const spec_info,
+    struct printf_spec_info *const spec_info,
     void *const info,
     const char *const string,
-    const uint64_t length,
+    const uint32_t length,
     bool *const should_continue_out)
 {
     (void)spec_info;
 
     struct callback_info *const cb_info = (struct callback_info *)info;
-    const uint64_t old_used = cb_info->buffer_used;
+    const uint32_t old_used = cb_info->buffer_used;
 
-    uint64_t new_used = old_used;
+    uint32_t new_used = old_used;
     if (__builtin_add_overflow(new_used, length, &new_used)) {
         *should_continue_out = false;
         return 0;
     }
 
-    const uint64_t buffer_size = cb_info->buffer_size;
-    uint64_t amount = length;
+    const uint32_t buffer_size = cb_info->buffer_size;
+    uint32_t amount = length;
 
     if (new_used >= buffer_size) {
         /*
@@ -101,9 +103,9 @@ format_to_buffer_write_string_callback(
     return amount;
 }
 
-uint64_t
+uint32_t
 vformat_to_buffer(char *const buffer_in,
-                  const uint64_t buffer_len,
+                  const uint32_t buffer_len,
                   const char *const format,
                   va_list list)
 {
@@ -118,7 +120,7 @@ vformat_to_buffer(char *const buffer_in,
         .buffer_size = buffer_len - 1
     };
 
-    const uint64_t length =
+    const uint32_t length =
         parse_printf_format(format_to_buffer_write_ch_callback,
                             &cb_info,
                             format_to_buffer_write_string_callback,
@@ -130,11 +132,11 @@ vformat_to_buffer(char *const buffer_in,
     return length;
 }
 
-static uint64_t
-get_length_ch_callback(const struct printf_spec_info *const spec_info,
+static uint32_t
+get_length_ch_callback(struct printf_spec_info *const spec_info,
                        void *const cb_info,
                        const char ch,
-                       const uint64_t times,
+                       const uint32_t times,
                        bool *const should_continue_out)
 {
     (void)spec_info;
@@ -146,11 +148,11 @@ get_length_ch_callback(const struct printf_spec_info *const spec_info,
     return times;
 }
 
-static uint64_t
-get_length_string_callback(const struct printf_spec_info *const spec_info,
+static uint32_t
+get_length_string_callback(struct printf_spec_info *const spec_info,
                            void *const cb_info,
                            const char *const string,
-                           const uint64_t length,
+                           const uint32_t length,
                            bool *const should_continue_out)
 {
     (void)spec_info;
@@ -162,18 +164,18 @@ get_length_string_callback(const struct printf_spec_info *const spec_info,
     return length;
 }
 
-uint64_t get_length_of_printf_format(const char *const fmt, ...) {
+uint32_t get_length_of_printf_format(const char *const fmt, ...) {
     va_list list;
     va_start(list, fmt);
 
-    const uint64_t result = get_length_of_printf_vformat(fmt, list);
+    const uint32_t result = get_length_of_printf_vformat(fmt, list);
 
     va_end(list);
     return result;
 }
 
-uint64_t get_length_of_printf_vformat(const char *const fmt, va_list list) {
-    const uint64_t length =
+uint32_t get_length_of_printf_vformat(const char *const fmt, va_list list) {
+    const uint32_t length =
         parse_printf_format(get_length_ch_callback,
                             /*char_cb_info=*/NULL,
                             get_length_string_callback,

example.h

@@ -26,19 +26,19 @@ SOFTWARE.
 #include <stdarg.h>
 
 __attribute__((format(printf, 3, 4)))
-uint64_t
+uint32_t
 format_to_buffer(char *buffer_in,
-                 uint64_t buffer_len,
+                 uint32_t buffer_len,
                  const char *format,
                  ...);
 
-uint64_t
+uint32_t
 vformat_to_buffer(char *buffer_in,
-                  uint64_t buffer_len,
+                  uint32_t buffer_len,
                   const char *format,
                   va_list list);
 
 __attribute__((format(printf, 1, 2)))
-uint64_t get_length_of_printf_format(const char *fmt, ...);
+uint32_t get_length_of_printf_format(const char *fmt, ...);
 
-uint64_t get_length_of_printf_vformat(const char *fmt, va_list list);
+uint32_t get_length_of_printf_vformat(const char *fmt, va_list list);