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
49
50
51
52
53
54
55
56
57
|
--- a/lwip-v6/src/api/sockets.c
+++ b/lwip-v6/src/api/sockets.c
@@ -1201,7 +1201,7 @@
struct um_sel_wait {
- void (* cb)();
+ void (* cb)(int*);
void *arg;
int fd;
int events;
@@ -1209,7 +1209,7 @@
};
static struct um_sel_wait *um_sel_head=NULL;
-static void um_sel_add(void (* cb)(), void *arg, int fd, int events)
+static void um_sel_add(void (* cb)(int*), void *arg, int fd, int events)
{
struct um_sel_wait *new=(struct um_sel_wait *)mem_malloc(sizeof(struct um_sel_wait));
//printf("UMSELECT ADD %d events %x arg %x\n",fd,events,arg);
@@ -1269,7 +1269,7 @@
um_sel_head=um_sel_rec_signal(um_sel_head,fd,events);
}
-int lwip_event_subscribe(void (* cb)(), void *arg, int fd, int events)
+int lwip_event_subscribe(void (* cb)(int*), void *arg, int fd, int events)
{
struct lwip_socket *psock=get_socket(fd);
int rv=0;
--- a/lwip-v6/src/radv/radvconf.c
+++ b/lwip-v6/src/radv/radvconf.c
@@ -155,16 +155,16 @@
}
-int str_to_bool(u8_t *bool, char *str)
+int str_to_bool(u8_t *bool_, char *str)
{
- if (strcmp(str, "true") == 0) { *bool=1; return 1; }
- if (strcmp(str, "TRUE") == 0) { *bool=1; return 1; }
- if (strcmp(str, "on") == 0) { *bool=1; return 1; }
- if (strcmp(str, "ON") == 0) { *bool=1; return 1; }
- if (strcmp(str, "false") == 0) { *bool=0; return 1; }
- if (strcmp(str, "FALSE") == 0) { *bool=0; return 1; }
- if (strcmp(str, "off") == 0) { *bool=0; return 1; }
- if (strcmp(str, "OFF") == 0) { *bool=0; return 1; }
+ if (strcmp(str, "true") == 0) { *bool_=1; return 1; }
+ if (strcmp(str, "TRUE") == 0) { *bool_=1; return 1; }
+ if (strcmp(str, "on") == 0) { *bool_=1; return 1; }
+ if (strcmp(str, "ON") == 0) { *bool_=1; return 1; }
+ if (strcmp(str, "false") == 0) { *bool_=0; return 1; }
+ if (strcmp(str, "FALSE") == 0) { *bool_=0; return 1; }
+ if (strcmp(str, "off") == 0) { *bool_=0; return 1; }
+ if (strcmp(str, "OFF") == 0) { *bool_=0; return 1; }
return 0;
}
|
