X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=d2a3e98b76e7692e948a08c9bd3598823ec35ffe;hp=48814c1890f8fcd7ea39e8c24ae3254c0d7d9057;hb=040ee979539e88ef71fb21a80d4a05d24961ae70;hpb=7138d0c54cd2212439434d27cb2d6ea775c3039b

diff --git a/util.c b/util.c
index 48814c1..d2a3e98 100644
--- a/util.c
+++ b/util.c
@@ -43,7 +43,7 @@
 #define DEFAULT_BUFFER_SIZE 4096
 #define MAX_BUFFER_SIZE 131072
 
-static char *hexdigits="0123456789abcdef";
+static const char *hexdigits="0123456789abcdef";
 
 uint32_t current_phase=0;
 
@@ -55,7 +55,7 @@ struct phase_hook {
 
 static struct phase_hook *hooks[NR_PHASES]={NULL,};
 
-char *safe_strdup(char *s, char *message)
+char *safe_strdup(const char *s, const char *message)
 {
     char *d;
     d=strdup(s);
@@ -65,7 +65,7 @@ char *safe_strdup(char *s, char *message)
     return d;
 }
 
-void *safe_malloc(size_t size, char *message)
+void *safe_malloc(size_t size, const char *message)
 {
     void *r;
     r=malloc(size);
@@ -155,7 +155,7 @@ uint32_t write_mpbin(MP_INT *a, uint8_t *buffer, uint32_t buflen)
     return i;
 }
 
-static char *phases[NR_PHASES]={
+static const char *phases[NR_PHASES]={
     "PHASE_INIT",
     "PHASE_GETOPTS",
     "PHASE_READCONFIG",
@@ -193,12 +193,12 @@ bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
 
 bool_t remove_hook(uint32_t phase, hook_fn *fn, void *state)
 {
-    fatal("remove_hook: not implemented\n");
+    fatal("remove_hook: not implemented");
 
     return False;
 }
 
-void log(struct log_if *lf, int priority, char *message, ...)
+void slilog(struct log_if *lf, int priority, const char *message, ...)
 {
     va_list ap;
     
@@ -212,18 +212,20 @@ struct buffer {
     struct buffer_if ops;
 };
 
-void buffer_assert_free(struct buffer_if *buffer, string_t file, uint32_t line)
+void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
+			uint32_t line)
 {
     if (!buffer->free) {
-	fatal("BUF_ASSERT_FREE, %s line %d, owned by %s\n",
+	fatal("BUF_ASSERT_FREE, %s line %d, owned by %s",
 	      file,line,buffer->owner);
     }
 }
 
-void buffer_assert_used(struct buffer_if *buffer, string_t file, uint32_t line)
+void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
+			uint32_t line)
 {
     if (buffer->free) {
-	fatal("BUF_ASSERT_USED, %s line %d, last owned by %s\n",
+	fatal("BUF_ASSERT_USED, %s line %d, last owned by %s",
 	      file,line,buffer->owner);
     }
 }
@@ -261,7 +263,7 @@ void *buf_unprepend(struct buffer_if *buf, uint32_t amount) {
 
 /* Append a two-byte length and the string to the buffer. Length is in
    network byte order. */
-void buf_append_string(struct buffer_if *buf, string_t s)
+void buf_append_string(struct buffer_if *buf, cstring_t s)
 {
     uint16_t len;