X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=f1be586bb179a7600e3a32b16d4c667cf7a417e1;hp=878d6653e22fe824a03a8cf25f19f8d6d94d2d40;hb=refs%2Ftags%2Fv0.1.17;hpb=ff05a229397c75142725f45cad191ce4a00625ce diff --git a/util.h b/util.h index 878d665..f1be586 100644 --- a/util.h +++ b/util.h @@ -4,6 +4,8 @@ #include "secnet.h" #include +#include "hackypar.h" + #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \ __FILE__,__LINE__); } \ while(0) @@ -15,9 +17,9 @@ while(0) (buf)->size=0; } while(0) #define BUF_FREE(buf) do { (buf)->free=True; } while(0) -extern void buffer_assert_free(struct buffer_if *buffer, string_t file, +extern void buffer_assert_free(struct buffer_if *buffer, cstring_t file, uint32_t line); -extern void buffer_assert_used(struct buffer_if *buffer, string_t file, +extern void buffer_assert_used(struct buffer_if *buffer, cstring_t file, uint32_t line); extern void buffer_new(struct buffer_if *buffer, uint32_t len); extern void buffer_init(struct buffer_if *buffer, uint32_t max_start_pad); @@ -26,7 +28,7 @@ extern void *buf_prepend(struct buffer_if *buf, uint32_t amount); extern void *buf_unappend(struct buffer_if *buf, uint32_t amount); extern void *buf_unprepend(struct buffer_if *buf, uint32_t amount); -extern void buf_append_string(struct buffer_if *buf, string_t s); +extern void buf_append_string(struct buffer_if *buf, cstring_t s); extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);