X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=be94c24d6ddd499fbd452bd83c19f34e197a0e76;hb=608f4ac7a840277f9754d8fe0410a31727057d3f;hp=6b1df4ea423e6f4ff1b88612896a9a7ef5d44e2e;hpb=b16800fa75472cc48f821a869fae1337a8de7355;p=ashd.git diff --git a/lib/utils.h b/lib/utils.h index 6b1df4e..be94c24 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -2,6 +2,7 @@ #define _UTILS_H #include +#include #define max(a, b) (((b) > (a))?(b):(a)) #define min(a, b) (((b) < (a))?(b):(a)) @@ -13,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 { \ @@ -65,5 +66,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