1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
commit eeacbaac57b033682fb6249435b3db22c3445eb1
Author: Dejan Muhamedagic <dejan@hello-penguin.com>
Date: Mon Jan 2 12:53:18 2017 +0100
Low: ipc: fix poll function parameter type
--- a/include/clplumbing/ipc.h
+++ b/include/clplumbing/ipc.h
@@ -700,7 +700,7 @@
/* Destroys an object constructed by ipc_set_auth or ipc_str_to_auth() */
extern void ipc_destroy_auth(IPC_Auth * auth);
-extern void ipc_set_pollfunc(int (*)(struct pollfd*, unsigned int, int));
+extern void ipc_set_pollfunc(int (*)(struct pollfd*, nfds_t, int));
extern void ipc_bufpool_dump_stats(void);
#ifdef IPC_TIME_DEBUG
--- a/lib/clplumbing/ipctest.c
+++ b/lib/clplumbing/ipctest.c
@@ -53,8 +53,8 @@
static int checksock(IPC_Channel* channel);
static void checkifblocked(IPC_Channel* channel);
-static int (*PollFunc)(struct pollfd * fds, unsigned int, int)
-= (int (*)(struct pollfd * fds, unsigned int, int)) poll;
+static int (*PollFunc)(struct pollfd * fds, nfds_t, int)
+= (int (*)(struct pollfd * fds, nfds_t, int)) poll;
static gboolean checkmsg(IPC_Message* rmsg, const char * who, int rcount);
static const char *procname;
--- a/lib/clplumbing/ocf_ipc.c
+++ b/lib/clplumbing/ocf_ipc.c
@@ -47,12 +47,12 @@
struct IPC_WAIT_CONNECTION * socket_wait_conn_new(GHashTable* ch_attrs);
struct IPC_CHANNEL * socket_client_channel_new(GHashTable* ch_attrs);
-int (*ipc_pollfunc_ptr)(struct pollfd*, unsigned int, int)
-= (int (*)(struct pollfd*, unsigned int, int)) poll;
+int (*ipc_pollfunc_ptr)(struct pollfd*, nfds_t, int)
+= (int (*)(struct pollfd*, nfds_t, int)) poll;
/* Set the IPC poll function to the given function */
void
-ipc_set_pollfunc(int (*pf)(struct pollfd*, unsigned int, int))
+ipc_set_pollfunc(int (*pf)(struct pollfd*, nfds_t, int))
{
ipc_pollfunc_ptr = pf;
}
|
