Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed plaintcp bug.
[ashd.git]
/
lib
/
utils.h
diff --git
a/lib/utils.h
b/lib/utils.h
index
3c9800c
..
be94c24
100644
(file)
--- a/
lib/utils.h
+++ b/
lib/utils.h
@@
-2,6
+2,10
@@
#define _UTILS_H
#include <stdarg.h>
#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__;})
#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 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 { \
#define sizebuf(buf, wanted) (_sizebuf((struct buffer *)&(buf), (wanted), sizeof(*((buf).b))))
#define bufadd(buf, new) \
do { \
@@
-61,5
+65,12
@@
char *decstr(char **p, size_t *len);
char *vsprintf2(char *format, va_list al);
char *sprintf2(char *format, ...);
char *sprintf3(char *format, ...);
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
#endif