Add an assortment of missing consts I've just noticed.

[originally from svn r9972]

diff --git a/network.h b/network.h
index 49ebd39c1d3818907b6b5f38c6ed95de3a59361b..b432ccae4918b7c7d635528ea0e76535f02bb8fe 100644 (file)
--- a/network.h
+++ b/network.h
@@ -116,7 +116,7 @@ void sk_cleanup(void);                     /* called just before program exit */
 SockAddr sk_namelookup(const char *host, char **canonicalname, int address_family);
 SockAddr sk_nonamelookup(const char *host);
 void sk_getaddr(SockAddr addr, char *buf, int buflen);
-int sk_hostname_is_local(char *name);
+int sk_hostname_is_local(const char *name);
 int sk_address_is_local(SockAddr addr);
 int sk_address_is_special_local(SockAddr addr);
 int sk_addrtype(SockAddr addr);

diff --git a/proxy.c b/proxy.c
index 13a507158bc032297206a37bb99e2ee4f7435e20..8a146231036be4c51d7ba77319cb667160ab16af 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -277,8 +277,8 @@ static int plug_proxy_accepting (Plug p, OSSocket sock)
  * This function can accept a NULL pointer as `addr', in which case
  * it will only check the host name.
  */
-static int proxy_for_destination (SockAddr addr, char *hostname, int port,
-                                 Conf *conf)
+static int proxy_for_destination (SockAddr addr, const char *hostname,
+                                  int port, Conf *conf)
 {
     int s = 0, e = 0;
     char hostip[64];

diff --git a/ssh.c b/ssh.c
index a3255a85e5705148fcef38191246ea693c762d13..9eed54dcd181be7af966f2643a2f3303553b6787 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -460,14 +460,14 @@ struct Packet;
 static struct Packet *ssh1_pkt_init(int pkt_type);
 static struct Packet *ssh2_pkt_init(int pkt_type);
 static void ssh_pkt_ensure(struct Packet *, int length);
-static void ssh_pkt_adddata(struct Packet *, void *data, int len);
+static void ssh_pkt_adddata(struct Packet *, const void *data, int len);
 static void ssh_pkt_addbyte(struct Packet *, unsigned char value);
 static void ssh2_pkt_addbool(struct Packet *, unsigned char value);
 static void ssh_pkt_adduint32(struct Packet *, unsigned long value);
 static void ssh_pkt_addstring_start(struct Packet *);
-static void ssh_pkt_addstring_str(struct Packet *, char *data);
-static void ssh_pkt_addstring_data(struct Packet *, char *data, int len);
-static void ssh_pkt_addstring(struct Packet *, char *data);
+static void ssh_pkt_addstring_str(struct Packet *, const char *data);
+static void ssh_pkt_addstring_data(struct Packet *, const char *data, int len);
+static void ssh_pkt_addstring(struct Packet *, const char *data);
 static unsigned char *ssh2_mpint_fmt(Bignum b, int *len);
 static void ssh1_pkt_addmp(struct Packet *, Bignum b);
 static void ssh2_pkt_addmp(struct Packet *, Bignum b);
@@ -1829,7 +1829,7 @@ static void ssh_pkt_ensure(struct Packet *pkt, int length)
        if (body) pkt->body = pkt->data + offset;
     }
 }
-static void ssh_pkt_adddata(struct Packet *pkt, void *data, int len)
+static void ssh_pkt_adddata(struct Packet *pkt, const void *data, int len)
 {
     if (pkt->logmode != PKTLOG_EMIT) {
        pkt->nblanks++;
@@ -1863,17 +1863,18 @@ static void ssh_pkt_addstring_start(struct Packet *pkt)
     ssh_pkt_adduint32(pkt, 0);
     pkt->savedpos = pkt->length;
 }
-static void ssh_pkt_addstring_str(struct Packet *pkt, char *data)
+static void ssh_pkt_addstring_str(struct Packet *pkt, const char *data)
 {
     ssh_pkt_adddata(pkt, data, strlen(data));
     PUT_32BIT(pkt->data + pkt->savedpos - 4, pkt->length - pkt->savedpos);
 }
-static void ssh_pkt_addstring_data(struct Packet *pkt, char *data, int len)
+static void ssh_pkt_addstring_data(struct Packet *pkt, const char *data,
+                                   int len)
 {
     ssh_pkt_adddata(pkt, data, len);
     PUT_32BIT(pkt->data + pkt->savedpos - 4, pkt->length - pkt->savedpos);
 }
-static void ssh_pkt_addstring(struct Packet *pkt, char *data)
+static void ssh_pkt_addstring(struct Packet *pkt, const char *data)
 {
     ssh_pkt_addstring_start(pkt);
     ssh_pkt_addstring_str(pkt, data);

diff --git a/ssh.h b/ssh.h
index 41ad305a4e7104a8d5249f42107fcc22ed1a8c29..031fd974091fd1f4a67d07b550d10c34e1688bdd 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -133,9 +133,9 @@ typedef struct {
     uint32 lenhi, lenlo;
 } SHA_State;
 void SHA_Init(SHA_State * s);
-void SHA_Bytes(SHA_State * s, void *p, int len);
+void SHA_Bytes(SHA_State * s, const void *p, int len);
 void SHA_Final(SHA_State * s, unsigned char *output);
-void SHA_Simple(void *p, int len, unsigned char *output);
+void SHA_Simple(const void *p, int len, unsigned char *output);
 
 void hmac_sha1_simple(void *key, int keylen, void *data, int datalen,
                      unsigned char *output);

diff --git a/sshsha.c b/sshsha.c
index 9e9ef8c6793860bda9a915cf7a9179ff4040db1d..a5b3a60c8465493578b08c9b1c74b5e3c1e27287 100644 (file)
--- a/sshsha.c
+++ b/sshsha.c
@@ -126,9 +126,9 @@ void SHA_Init(SHA_State * s)
     s->lenhi = s->lenlo = 0;
 }
 
-void SHA_Bytes(SHA_State * s, void *p, int len)
+void SHA_Bytes(SHA_State * s, const void *p, int len)
 {
-    unsigned char *q = (unsigned char *) p;
+    const unsigned char *q = (const unsigned char *) p;
     uint32 wordblock[16];
     uint32 lenw = len;
     int i;
@@ -207,7 +207,7 @@ void SHA_Final(SHA_State * s, unsigned char *output)
     }
 }
 
-void SHA_Simple(void *p, int len, unsigned char *output)
+void SHA_Simple(const void *p, int len, unsigned char *output)
 {
     SHA_State s;
 

diff --git a/unix/uxnet.c b/unix/uxnet.c
index 5190ef83f8b6afa3a09641cbc8df87141c0575b8..d8460c19aa67fe8aca2be3e32a3392a06e94c6e6 100644 (file)
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -341,7 +341,7 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
     }
 }
 
-int sk_hostname_is_local(char *name)
+int sk_hostname_is_local(const char *name)
 {
     return !strcmp(name, "localhost") ||
           !strcmp(name, "::1") ||

diff --git a/windows/winnet.c b/windows/winnet.c
index c73ace98128f99e296bd4fdd5c2dae1a041ccfb3..4fddd72c013740e1c469eec0974be79206647adc 100644 (file)
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -672,7 +672,7 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
     }
 }
 
-int sk_hostname_is_local(char *name)
+int sk_hostname_is_local(const char *name)
 {
     return !strcmp(name, "localhost") ||
           !strcmp(name, "::1") ||