summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/event.c
diff options
context:
space:
mode:
authorMilind Changire <mchangir@redhat.com>2019-02-23 18:58:48 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2019-02-25 15:23:11 +0000
commit155ebe4b5719f40b3feaf9fd8ff892cc10ad0e78 (patch)
treeecbc9f2e88f385ff6b8f7f357b1678601b520c11 /libglusterfs/src/event.c
parent2620dbccccb63fba66384b17b47ddd8e784e8390 (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 'libglusterfs/src/event.c')
-rw-r--r--libglusterfs/src/event.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c
index 5b4d43e8650..8d3d06bafc4 100644
--- a/libglusterfs/src/event.c
+++ b/libglusterfs/src/event.c
@@ -159,12 +159,12 @@ out:
return ret;
}
-int
+void
poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out,
int poll_in, int poll_err)
{
struct event_destroy_data *destroy = NULL;
- int readfd = -1, ret = -1;
+ int readfd = -1;
char buf = '\0';
destroy = data;
@@ -176,11 +176,10 @@ poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out,
while (sys_read(readfd, &buf, 1) > 0) {
}
- ret = 0;
out:
event_handled(destroy->pool, fd, idx, gen);
- return ret;
+ return;
}
/* This function destroys all the poller threads.