generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

easy: rename struct monitor to socketmonitor

Browse Source 
'struct monitor', introduced in 6cf8413e, already exists in an IRIX
header file (sys/mon.h) which gets included via various standard headers
by lib/easy.c

cc-1101 cc: ERROR File = ../../curl/lib/easy.c, Line = 458
"monitor" has already been declared in the current scope.

Reported-by: Tor Arntsen
This commit is contained in:
Daniel Stenberg 2013-08-29 09:57:14 +02:00
parent 6a353049ac
commit 2f9b64ac33
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/easy.c
View File

@ -455,8 +455,8 @@ CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
#ifdef CURLDEBUG #ifdef CURLDEBUG
struct monitor { struct socketmonitor {
struct monitor *next; /* the next node in the list or NULL */ struct socketmonitor *next; /* the next node in the list or NULL */
struct pollfd socket; /* socket info of what to monitor */ struct pollfd socket; /* socket info of what to monitor */
}; };
@ -464,7 +464,7 @@ struct events {
long ms; /* timeout, run the timeout function when reached */ long ms; /* timeout, run the timeout function when reached */
bool msbump; /* set TRUE when timeout is set by callback */ bool msbump; /* set TRUE when timeout is set by callback */
int num_sockets; /* number of nodes in the monitor list */ int num_sockets; /* number of nodes in the monitor list */
struct monitor *list; /* list of sockets to monitor */ struct socketmonitor *list; /* list of sockets to monitor */
int running_handles; /* store the returned number */ int running_handles; /* store the returned number */
}; };
@ -538,8 +538,8 @@ static int events_socket(CURL *easy, /* easy handle */
pointer */ pointer */
{ {
struct events *ev = userp; struct events *ev = userp;
struct monitor *m; struct socketmonitor *m;
struct monitor *prev=NULL; struct socketmonitor *prev=NULL;
(void)socketp; (void)socketp;
m = ev->list; m = ev->list;
@ -547,7 +547,7 @@ static int events_socket(CURL *easy, /* easy handle */
if(m->socket.fd == s) { if(m->socket.fd == s) {
if(what == CURL_POLL_REMOVE) { if(what == CURL_POLL_REMOVE) {
struct monitor *nxt = m->next; struct socketmonitor *nxt = m->next;
/* remove this node from the list of monitored sockets */ /* remove this node from the list of monitored sockets */
if(prev) if(prev)
prev->next = nxt; prev->next = nxt;
@ -578,7 +578,7 @@ static int events_socket(CURL *easy, /* easy handle */
__func__, s); */ __func__, s); */
} }
else { else {
m = malloc(sizeof(struct monitor)); m = malloc(sizeof(struct socketmonitor));
m->next = ev->list; m->next = ev->list;
m->socket.fd = s; m->socket.fd = s;
m->socket.events = socketcb2poll(what); m->socket.events = socketcb2poll(what);
@ -624,7 +624,7 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
while(!done) { while(!done) {
CURLMsg *msg; CURLMsg *msg;
struct monitor *m; struct socketmonitor *m;
struct pollfd *f; struct pollfd *f;
struct pollfd fds[4]; struct pollfd fds[4];
int numfds=0; int numfds=0;