X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=be94c24d6ddd499fbd452bd83c19f34e197a0e76;hb=3a42b6b1d0b8f9e8ce5c77e838e2573bbfabe593;hp=2b9d1dfac0e39f0b94a82856c344351f0e1e09a8;hpb=f2b26d44416abd494ce430659cfbbf254d9c3c55;p=ashd.git diff --git a/lib/utils.h b/lib/utils.h index 2b9d1df..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 { \ @@ -67,5 +68,9 @@ 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