From fbc4b57c2877f4275d1799154f2843f938c6dc00 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 11 Mar 2009 04:41:23 +0000 Subject: [PATCH] Remove warnings from ipc.c git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1829 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/ipc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/exec/ipc.c b/exec/ipc.c index 4b43387d..ef3688ae 100644 --- a/exec/ipc.c +++ b/exec/ipc.c @@ -161,6 +161,10 @@ static int priv_change (struct conn_info *conn_info); static void ipc_disconnect (struct conn_info *conn_info); +static void msg_send (void *conn, struct iovec *iov, int iov_len, int locked); + +static int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len); + static int ipc_thread_active (void *conn) { struct conn_info *conn_info = (struct conn_info *)conn; @@ -337,9 +341,10 @@ req_setup_send ( int error) { mar_res_setup_t res_setup; - res_setup.error = error; unsigned int res; + res_setup.error = error; + retry_send: res = send (conn_info->fd, &res_setup, sizeof (mar_res_setup_t), MSG_WAITALL); if (res == -1 && errno == EINTR) { @@ -682,9 +687,9 @@ static int conn_info_create (int fd) #endif #if defined(COROSYNC_LINUX) -char *socketname = "libais.socket"; +const char *socketname = "libais.socket"; #else -char *socketname = "/var/run/libais.socket"; +const char *socketname = "/var/run/libais.socket"; #endif static int poll_handler_accept ( @@ -914,7 +919,7 @@ static int shared_mem_dispatch_bytes_left (struct conn_info *conn_info) return (bytes_left); } -int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len) +static int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len) { char *dest_char = (char *)conn_info->mem->dispatch_buffer; char *src_char = (char *)msg; @@ -935,7 +940,7 @@ int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len) return (0); } -void msg_send (void *conn, struct iovec *iov, int iov_len, int locked) +static void msg_send (void *conn, struct iovec *iov, int iov_len, int locked) { struct conn_info *conn_info = (struct conn_info *)conn; struct sembuf sop; -- 2.39.5