Merge branch 'master' of /srv/git/r/ashd

[ashd.git] / lib / utils.h

diff --git a/lib/utils.h b/lib/utils.h
index e359d6c..5aae92c 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -13,7 +13,7 @@
 #define omalloc(o) ((o) = szmalloc(sizeof(*(o))))
 
 #define bufinit(buf) memset(&(buf), 0, sizeof(buf))
-#define buffree(buf) do { if((buf).b != NULL) {free((buf).b);} } while(0)
+#define buffree(buf) do { if((buf).b != NULL) {free((buf).b);} bufinit(buf); } while(0)
 #define sizebuf(buf, wanted) (_sizebuf((struct buffer *)&(buf), (wanted), sizeof(*((buf).b))))
 #define bufadd(buf, new) \
 do { \
@@ -68,5 +68,8 @@ off_t atoo(char *n);
 char **tokenize(char *src);
 void freeca(char **ca);
 int calen(char **a);
+void bvprintf(struct charbuf *buf, char *format, va_list al);
+void bprintf(struct charbuf *buf, char *format, ...);
+void replstr(char **p, char *n);
 
 #endif