Change connect_pipe to get dlog_control_msg struct by pointer

As this struct has a flexible array member, a pointer fits better.

Change-Id: I6df7c1c372ea0f061bca05faf9538713c77f8a75

diff --git a/include/logpipe.h b/include/logpipe.h
index a3b2d6f..7172f75 100644 (file)
--- a/include/logpipe.h
+++ b/include/logpipe.h
@@ -54,6 +54,6 @@ struct dlog_control_msg {
 /* should fit a whole command line with concatenated arguments (reasonably) */
 #define MAX_LOGGER_REQUEST_LEN 127
 
-int connect_pipe(const char *path, struct dlog_control_msg ctrl_msg, int timeout_ms);
+int connect_pipe(const char *path, struct dlog_control_msg *ctrl_msg, int timeout_ms);
 
 #endif

diff --git a/src/libdlog/log_pipe.c b/src/libdlog/log_pipe.c
index aaaabd6..a7a2107 100644 (file)
--- a/src/libdlog/log_pipe.c
+++ b/src/libdlog/log_pipe.c
@@ -61,7 +61,7 @@ static int __reconnect_pipe(log_id_t log_id)
        const int wrlock = pthread_rwlock_wrlock(&log_pipe_lock);
        assert(!wrlock); // we are never supposed to have a read lock at this point so wrlock() can't fail
 
-       new_fd = connect_pipe(log_pipe_path[log_id], DLOG_CTRL_REQ_PIPE, wait_pipe_ms);
+       new_fd = connect_pipe(log_pipe_path[log_id], &DLOG_CTRL_REQ_PIPE, wait_pipe_ms);
        if (new_fd < 0) {
                /* if connnecting fails consequently assume
                 * dlog_logger is broken and reduce the timeout to

diff --git a/src/shared/connect_pipe.c b/src/shared/connect_pipe.c
index 592b4b4..56104bc 100644 (file)
--- a/src/shared/connect_pipe.c
+++ b/src/shared/connect_pipe.c
@@ -14,7 +14,7 @@
  * @param[in] timeout_ms How long to wait for input on sockfd, forever if 0
  * @return Pipe file descriptor, or negative errno on failure
  */
-int connect_pipe(const char *path, struct dlog_control_msg ctrl_msg, int timeout_ms)
+int connect_pipe(const char *path, struct dlog_control_msg *ctrl_msg, int timeout_ms)
 {
        int r;
        int fd;
@@ -33,7 +33,7 @@ int connect_pipe(const char *path, struct dlog_control_msg ctrl_msg, int timeout
                return -errno;
        }
 
-       r = write(fd, &ctrl_msg, ctrl_msg.length);
+       r = write(fd, ctrl_msg, ctrl_msg->length);
        if (r < 0) {
                close(fd);
                return -errno;