Fix some __VA_ARGS__ macro issues (ugh)

1 files changed, 12 insertions, 14 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 837d377..496f106 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -16,22 +16,16 @@
 //   thing or at least a small range).
 //
 
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
-#define printstr(s) \
-    if (s) printf("%.*s", (int)(s)->size, (s)->mem);
-#define printstrln(s) \
-    if (s) printf("%.*s\n", (int)(s)->size, (s)->mem);
 
 //
-// This simple header just typedefs the basic C define types to a shorter name,
-// loads the quality of life bool macro for _Bool and defines shorthand macros
-// for byte sizes.  We need that the targeted architecture uses the floating
-// point representation as described on the IEEE-754 standard.
+// Basic types.
 //
 
 _Static_assert(sizeof(double) == 8, "no support for IEEE-754");
@@ -1119,8 +1113,6 @@ log_float(Logger *l, f64 num, sz precision) {
     log_int(l, fractional);
 }
 
-#include <stdarg.h>
-
 void
 log_print(Logger *l, Str format, ...) {
     assert(l);
@@ -1287,12 +1279,18 @@ log_init(sz memsize, FILE *dest, Arena arena) {
 
 // Default loggers and convenience macros for printing.
 Logger logger_inf, logger_err;
-#define print(format, ...) \
+
+#define _print(format, ...) \
     log_print(&logger_inf, (Str){(u8 *)(format), LEN(format) - 1}, __VA_ARGS__)
-#define println(format, ...) print(format "\n", __VA_ARGS__)
-#define printerr(format, ...) \
+#define _println(format, ...) print(format "\n", __VA_ARGS__)
+#define print(...) _print(__VA_ARGS__, "")
+#define println(...) _println(__VA_ARGS__, "")
+
+#define _printerr(format, ...) \
     log_print(&logger_err, (Str){(u8 *)(format), LEN(format) - 1}, __VA_ARGS__)
-#define printerrln(format, ...) printerr(format "\n", __VA_ARGS__)
+#define _printerrln(format, ...) printerr(format "\n", __VA_ARGS__)
+#define printerr(...) _printerr(__VA_ARGS__, "")
+#define printerrln(...) _printerrln(__VA_ARGS__, "")
 
 void
 log_func_register(Logger *l, LogFuncMap map) {