From: Denis Ovsienko <infrastation@yandex.ru>
Date: Tue, 10 Jan 2012 11:58:04 +0000 (+0400)
Subject: babeld: address remaining -Wcast-qual warnings
X-Git-Tag: frr-2.0-rc1~1871^2~61
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=87c271c69330cfcea7955503eba3ed15a15cb634;p=mirror%2Ffrr.git

babeld: address remaining -Wcast-qual warnings

* net.c
  * babel_send(): arguments are not treated as "const", justify
    declaration
* babel_main.c: declare constant pointers as such
---

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index b4d60886e4..1c1d0eeb90 100644
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -87,14 +87,14 @@ int link_detect = 0;
 int wireless_hello_interval = -1;
 int wired_hello_interval = -1;
 int idle_hello_interval = -1;
-static char *pidfile = PATH_BABELD_PID;
+static const char *pidfile = PATH_BABELD_PID;
 
 const unsigned char zeroes[16] = {0};
 const unsigned char ones[16] =
     {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
      0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
-static char *state_file = "/var/lib/babeld/babel-state";
+static const char *state_file = "/var/lib/babeld/babel-state";
 
 unsigned char protocol_group[16]; /* babel's link-local multicast address */
 int protocol_port;                /* babel's port */
diff --git a/babeld/net.c b/babeld/net.c
index 5cb1236e7f..eaed51d20a 100644
--- a/babeld/net.c
+++ b/babeld/net.c
@@ -139,16 +139,16 @@ babel_recv(int s, void *buf, int buflen, struct sockaddr *sin, int slen)
 
 int
 babel_send(int s,
-           const void *buf1, int buflen1, const void *buf2, int buflen2,
-           const struct sockaddr *sin, int slen)
+           void *buf1, int buflen1, void *buf2, int buflen2,
+           struct sockaddr *sin, int slen)
 {
     struct iovec iovec[2];
     struct msghdr msg;
     int rc;
 
-    iovec[0].iov_base = (void*)buf1;
+    iovec[0].iov_base = buf1;
     iovec[0].iov_len = buflen1;
-    iovec[1].iov_base = (void*)buf2;
+    iovec[1].iov_base = buf2;
     iovec[1].iov_len = buflen2;
     memset(&msg, 0, sizeof(msg));
     msg.msg_name = (struct sockaddr*)sin;
diff --git a/babeld/net.h b/babeld/net.h
index e6729001d9..4bd0f04f96 100644
--- a/babeld/net.h
+++ b/babeld/net.h
@@ -39,6 +39,6 @@ THE SOFTWARE.
 int babel_socket(int port);
 int babel_recv(int s, void *buf, int buflen, struct sockaddr *sin, int slen);
 int babel_send(int s,
-               const void *buf1, int buflen1, const void *buf2, int buflen2,
-               const struct sockaddr *sin, int slen);
+               void *buf1, int buflen1, void *buf2, int buflen2,
+               struct sockaddr *sin, int slen);
 int tcp_server_socket(int port, int local);