X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=f1be586bb179a7600e3a32b16d4c667cf7a417e1;hp=0c661a8876a7e974efbd58ab022b31089e0d50ed;hb=0009e60a914ef5239ba2f8cc19e07ab5368e49b1;hpb=b2a56f7c93d221607864761c590952b9a614dc9f

diff --git a/util.h b/util.h
index 0c661a8..f1be586 100644
--- a/util.h
+++ b/util.h
@@ -1,18 +1,10 @@
-/* $Log: util.h,v $
- * Revision 1.1  1996/03/14 17:05:12  sde1000
- * Initial revision
- *
- */
-
 #ifndef util_h
 #define util_h
 
 #include "secnet.h"
 #include <gmp.h>
 
-extern uint32_t message_level;
-extern bool_t secnet_is_daemon;
-extern struct log_if *system_log;
+#include "hackypar.h"
 
 #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \
 						     __FILE__,__LINE__); } \
@@ -25,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);
@@ -36,9 +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 enter_phase(uint32_t new_phase);
+extern void buf_append_string(struct buffer_if *buf, cstring_t s);
 
 extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);