diff options
| author | Milind Changire <mchangir@redhat.com> | 2019-02-23 18:58:48 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2019-02-25 15:23:11 +0000 |
| commit | 155ebe4b5719f40b3feaf9fd8ff892cc10ad0e78 (patch) | |
| tree | ecbc9f2e88f385ff6b8f7f357b1678601b520c11 /rpc | |
| parent | 2620dbccccb63fba66384b17b47ddd8e784e8390 (diff) | |
socket: socket event handlers now return void
Problem:
Returning any value from socket event handlers to the event sub-system
doesn't make sense since event sub-system cannot handle socket
sub-system errors.
Solution:
Change return type of all socket event handlers to 'void'
mainline:
> Reviewed-on: https://review.gluster.org/c/glusterfs/+/22221
Change-Id: I70dc2c57f12b7ea2fae41120f71aa0d7fe0b2b6f
Fixes: bz#1651246
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 776ba851c6ee6c265253d44cf1d6e4e3d4a21772)
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index c413b7d20ac..40d2be30782 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2833,7 +2833,7 @@ socket_complete_connection(rpc_transport_t *this) } /* reads rpc_requests during pollin */ -static int +static void socket_event_handler(int fd, int idx, int gen, void *data, int poll_in, int poll_out, int poll_err) { @@ -2883,7 +2883,7 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in, if (ret > 0) { gf_log(this->name, GF_LOG_TRACE, "(sock:%d) returning to wait on socket", priv->sock); - return 0; + return; } } else { char *sock_type = (priv->is_server ? "Server" : "Client"); @@ -2938,10 +2938,10 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in, } out: - return ret; + return; } -static int +static void socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in, int poll_out, int poll_err) { @@ -3169,7 +3169,7 @@ socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in, } } out: - return ret; + return; } static int |