Enforce const-correctness in UNIX socket wrappers

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index 35ce3b6b5c9ca2a720a509d3d95aa172931a221a..b870deef48b325614d73412a169ef086b02f5245 100644 (file)
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -407,7 +407,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
  * Return the size of sent data.
  */
 LTTNG_HIDDEN

-ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, const void *buf,

                size_t len, int flags)
 {
        struct msghdr msg;
                size_t len, int flags)
 {
        struct msghdr msg;


@@ -416,7 +416,7 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 
        memset(&msg, 0, sizeof(msg));
 
 
        memset(&msg, 0, sizeof(msg));
 

-       iov[0].iov_base = buf;
+       iov[0].iov_base = (void *) buf;

        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;

diff --git a/src/common/sessiond-comm/inet.h b/src/common/sessiond-comm/inet.h
index 6a79c91061d0be0499a881c1b7267852f7230ec0..03549fabd181f19b0ae54d34ba35d366ea62e36e 100644 (file)
--- a/src/common/sessiond-comm/inet.h
+++ b/src/common/sessiond-comm/inet.h
@@ -57,8 +57,8 @@ extern int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog);
 
 extern ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags);
 
 extern ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags);

-extern ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
-               size_t len, int flags);
+extern ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock,
+               const void *buf, size_t len, int flags);

 
 /* Initialize inet communication layer. */
 extern void lttcomm_inet_init(void);
 
 /* Initialize inet communication layer. */
 extern void lttcomm_inet_init(void);

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index a29adad4214c941d3287c6dc7f6851559c2d8af5..51d02ebb91d426fffc3928e0435240e8077ac861 100644 (file)
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -386,7 +386,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
  * Return the size of sent data.
  */
 LTTNG_HIDDEN

-ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,

                size_t len, int flags)
 {
        struct msghdr msg;
                size_t len, int flags)
 {
        struct msghdr msg;


@@ -395,7 +395,7 @@ ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 
        memset(&msg, 0, sizeof(msg));
 
 
        memset(&msg, 0, sizeof(msg));
 

-       iov[0].iov_base = buf;
+       iov[0].iov_base = (void *) buf;

        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;

diff --git a/src/common/sessiond-comm/inet6.h b/src/common/sessiond-comm/inet6.h
index 3af3be5be2cba6b3ad85908804c12acc6d9c57d2..5c2ed537158626802604a8fdf9d05a35e2f4f757 100644 (file)
--- a/src/common/sessiond-comm/inet6.h
+++ b/src/common/sessiond-comm/inet6.h
@@ -38,7 +38,7 @@ extern int lttcomm_listen_inet6_sock(struct lttcomm_sock *sock, int backlog);
 
 extern ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags);
 
 extern ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags);

-extern ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
-               size_t len, int flags);
+extern ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock,
+               const void *buf, size_t len, int flags);

 
 #endif /* _LTTCOMM_INET6_H */
 
 #endif /* _LTTCOMM_INET6_H */

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 4a204c02e401fbbd8852545975dc3cce67bcc3bc..ec7d36ae50d07d021738d635a44267d7de84fc03 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -218,8 +218,8 @@ struct lttcomm_proto_ops {
        int (*listen) (struct lttcomm_sock *sock, int backlog);
        ssize_t (*recvmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
                        int flags);
        int (*listen) (struct lttcomm_sock *sock, int backlog);
        ssize_t (*recvmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
                        int flags);

-       ssize_t (*sendmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
-                       int flags);
+       ssize_t (*sendmsg) (struct lttcomm_sock *sock, const void *buf,
+                       size_t len, int flags);

 };
 
 /*
 };
 
 /*

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index 5e0ba62812307d239a6d2f9db76475deb481a976..8d2e03a5b3f7b1ed894da2eae4dc67693b9a0d3d 100644 (file)
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -205,7 +205,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
  * Return the size of sent data.
  */
 LTTNG_HIDDEN

-ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
+ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len)

 {
        struct msghdr msg;
        struct iovec iov[1];
 {
        struct msghdr msg;
        struct iovec iov[1];


@@ -213,7 +213,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 
        memset(&msg, 0, sizeof(msg));
 
 
        memset(&msg, 0, sizeof(msg));
 

-       iov[0].iov_base = buf;
+       iov[0].iov_base = (void *) buf;

        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;

diff --git a/src/common/sessiond-comm/unix.h b/src/common/sessiond-comm/unix.h
index 7ea05032fb39fa511eb1f761e3e212be0fc7666d..24786b8fecbf2c2c805f4cb77d8cc7029ddad6f8 100644 (file)
--- a/src/common/sessiond-comm/unix.h
+++ b/src/common/sessiond-comm/unix.h
@@ -49,7 +49,7 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd);
 LTTNG_HIDDEN
 ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
 LTTNG_HIDDEN
 LTTNG_HIDDEN
 ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
 LTTNG_HIDDEN

-ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
+ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len);

 
 LTTNG_HIDDEN
 ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len);
 
 LTTNG_HIDDEN
 ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len);

diff --git a/src/lib/lttng-ctl/lttng-ctl-helper.h b/src/lib/lttng-ctl/lttng-ctl-helper.h
index 5f6d5c209a4163077048353f8a9c172480bb99b8..b7a28268cb3b4ce83b95eb978667951527064212 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl-helper.h
+++ b/src/lib/lttng-ctl/lttng-ctl-helper.h
@@ -35,14 +35,14 @@ void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
                struct lttng_domain *src);
 
 /*
                struct lttng_domain *src);
 
 /*

- * Sends the lttcomm message to the session daemon and fills buf of the
+ * Sends the lttcomm message to the session daemon and fills buf if the

  * returned data is not NULL.
  *
  * Return the size of the received data on success or else a negative lttng
  * error code. If buf is NULL, 0 is returned on success.
  */
 int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
  * returned data is not NULL.
  *
  * Return the size of the received data on success or else a negative lttng
  * error code. If buf is NULL, 0 is returned on success.
  */
 int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,

-               void *vardata, size_t varlen, void **buf);
+               const void *vardata, size_t varlen, void **buf);

 
 /*
  * Use this if no variable length data needs to be sent.
 
 /*
  * Use this if no variable length data needs to be sent.

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 03b74c0b74771a9d0be8158f152a617123799c47..14bb7b32dab3f1559a0468cdc484c456961fdbd5 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -150,7 +150,7 @@ end:
  * On success, returns the number of bytes sent (>=0)
  * On error, returns -1
  */
  * On success, returns the number of bytes sent (>=0)
  * On error, returns -1
  */

-static int send_session_varlen(void *data, size_t len)
+static int send_session_varlen(const void *data, size_t len)

 {
        int ret;
 
 {
        int ret;
 


@@ -400,7 +400,7 @@ static int disconnect_sessiond(void)
  */
 LTTNG_HIDDEN
 int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
  */
 LTTNG_HIDDEN
 int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,

-               void *vardata, size_t varlen, void **buf)
+               const void *vardata, size_t varlen, void **buf)

 {
        int ret;
        size_t size;
 {
        int ret;
        size_t size;