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

diff --git a/lib/utils.h b/lib/utils.h
index 4f85743..2de1df6 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -2,6 +2,10 @@
 #define _UTILS_H
 
 #include <stdarg.h>
+#include <sys/types.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__;})
@@ -10,7 +14,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 { \
@@ -56,11 +60,29 @@ struct charvbuf {
     size_t s, d;
 };
 
+struct btree {
+    struct btree *l, *r;
+    int h;
+    void *d;
+};
+
 void _sizebuf(struct buffer *buf, size_t wanted, size_t el);
 char *decstr(char **p, size_t *len);
 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);
+char *base64encode(char *data, size_t datalen);
+char *base64decode(char *data, size_t *datalen);
+int bbtreedel(struct btree **tree, void *item, int (*cmp)(void *, void *));
+void freebtree(struct btree **tree, void (*ffunc)(void *));
+int bbtreeput(struct btree **tree, void *item, int (*cmp)(void *, void *));
+void *btreeget(struct btree *tree, void *key, int (*cmp)(void *, void *));
 
 #endif