X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=5aae92c4818eb49d907b0bf2439f8b1c5ad58f07;hb=9dc25d3d8337f3e9ecc31530f3be10b9ecf07422;hp=4f85743bac6b01fe253c28b4c5943945fbc825bb;hpb=9aee4cbccec780463362ace7fd611d7b591934b9;p=ashd.git

diff --git a/lib/utils.h b/lib/utils.h
index 4f85743..5aae92c 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -3,6 +3,9 @@
 
 #include <stdarg.h>
 
+#define max(a, b) (((b) > (a))?(b):(a))
+#define min(a, b) (((b) < (a))?(b):(a))
+
 #define smalloc(size) ({void *__result__; ((__result__ = malloc(size)) == NULL)?({exit(-1); (void *)0;}):__result__;})
 #define srealloc(ptr, size) ({void *__result__; ((__result__ = realloc((ptr), (size))) == NULL)?({exit(-1); (void *)0;}):__result__;})
 #define szmalloc(size) memset(smalloc(size), 0, size)
@@ -10,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 { \
@@ -62,5 +65,11 @@ char *vsprintf2(char *format, va_list al);
 char *sprintf2(char *format, ...);
 char *sprintf3(char *format, ...);
 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