Add str_{,v}appendf, use it everywhere.

This change doesn't affect generated binary code.

1 files changed, 7 insertions, 0 deletions

diff --git a/strfuncs.h b/strfuncs.h
index 59371341..657812d8 100644
--- a/strfuncs.h
+++ b/strfuncs.h
@@ -7,9 +7,16 @@
 #ifndef _GPSD_STRFUNCS_H_
 #define _GPSD_STRFUNCS_H_
 
+#include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 
 #define str_starts_with(str, prefix) \
     (strncmp((str), (prefix), strlen(prefix)) == 0)
 
+#define str_appendf(str, alloc_size, format, ...) \
+    ((void) snprintf((str) + strlen(str), (alloc_size) - strlen(str), (format), ##__VA_ARGS__))
+#define str_vappendf(str, alloc_size, format, ap) \
+    ((void) vsnprintf((str) + strlen(str), (alloc_size) - strlen(str), (format), (ap)))
+
 #endif /* _GPSD_STRFUNCS_H_ */