diff options
| -rw-r--r-- | src/irc/dcc/dcc-autoget.c | 2 | ||||
| -rw-r--r-- | src/irc/dcc/dcc-resume.c | 12 | ||||
| -rw-r--r-- | src/irc/dcc/dcc-send.c | 2 | ||||
| -rw-r--r-- | src/irc/dcc/dcc.c | 4 | ||||
| -rw-r--r-- | src/irc/dcc/dcc.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c index 59e01c7b..54b3a0e2 100644 --- a/src/irc/dcc/dcc-autoget.c +++ b/src/irc/dcc/dcc-autoget.c @@ -52,7 +52,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr) /* check file size limit, NOTE: it's still possible to send a bogus file size and then just send what ever sized file.. */ max_size = settings_get_int("dcc_autoget_max_size"); - if (max_size > 0 && max_size*1024 < dcc->size) + if (max_size > 0 && (unsigned long) max_size*1024 < dcc->size) return; /* ok. but do we want/need to resume? */ diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c index ae1415e1..f97f6ae9 100644 --- a/src/irc/dcc/dcc-resume.c +++ b/src/irc/dcc/dcc-resume.c @@ -45,7 +45,7 @@ static FILE_DCC_REC *dcc_resume_find(int type, const char *nick, int port) } static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick, - FILE_DCC_REC **dcc, long *size) + FILE_DCC_REC **dcc, unsigned long *size) { char **params; int paramcount; @@ -57,7 +57,7 @@ static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick, if (paramcount >= 3) { port = atoi(params[paramcount-2]); - *size = atol(params[paramcount-1]); + *size = strtoul(params[paramcount-1], NULL, 10); *dcc = dcc_resume_find(type, nick, port); } @@ -66,13 +66,13 @@ static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick, } static int dcc_resume_file_check(FILE_DCC_REC *dcc, IRC_SERVER_REC *server, - long size) + unsigned long size) { if (size >= dcc->size) { /* whole file sent */ dcc->starttime = time(NULL); dcc_reject(DCC(dcc), server); - } else if (lseek(dcc->fhandle, size, SEEK_SET) != size) { + } else if (lseek(dcc->fhandle, size, SEEK_SET) != (long)size) { /* error, or trying to seek after end of file */ dcc_reject(DCC(dcc), server); } else { @@ -90,7 +90,7 @@ static void ctcp_msg_dcc_resume(IRC_SERVER_REC *server, const char *data, { FILE_DCC_REC *dcc; char *str; - long size; + unsigned long size; if (!dcc_ctcp_resume_parse(DCC_SEND_TYPE, data, nick, &dcc, &size)) { signal_emit("dcc error ctcp", 5, "RESUME", data, @@ -112,7 +112,7 @@ static void ctcp_msg_dcc_accept(IRC_SERVER_REC *server, const char *data, const char *target, DCC_REC *chat) { FILE_DCC_REC *dcc; - long size; + unsigned long size; if (!dcc_ctcp_resume_parse(DCC_GET_TYPE, data, nick, &dcc, &size) || (dcc != NULL && DCC_GET(dcc)->get_type != DCC_GET_RESUME)) { diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c index ebd155c6..319898ef 100644 --- a/src/irc/dcc/dcc-send.c +++ b/src/irc/dcc/dcc-send.c @@ -101,7 +101,7 @@ static void dcc_send_read_size(SEND_DCC_REC *dcc) memcpy(&bytes, dcc->count_buf, 4); bytes = (guint32) ntohl(bytes); - dcc->gotalldata = (long) bytes == dcc->transfd; + dcc->gotalldata = (unsigned long) bytes == dcc->transfd; dcc->count_pos = 0; if (dcc->waitforend && dcc->gotalldata) { diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c index 7b07e5d3..326d922d 100644 --- a/src/irc/dcc/dcc.c +++ b/src/irc/dcc/dcc.c @@ -181,9 +181,9 @@ void dcc_str2ip(const char *str, IPADDR *ip) } /* Start listening for incoming connections */ -GIOChannel *dcc_listen(GIOChannel *interface, IPADDR *ip, int *port) +GIOChannel *dcc_listen(GIOChannel *iface, IPADDR *ip, int *port) { - if (net_getsockname(interface, ip, NULL) == -1) + if (net_getsockname(iface, ip, NULL) == -1) return NULL; *port = settings_get_int("dcc_port"); diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h index 59647746..bd30ae48 100644 --- a/src/irc/dcc/dcc.h +++ b/src/irc/dcc/dcc.h @@ -48,7 +48,7 @@ void dcc_ip2str(IPADDR *ip, char *str); void dcc_str2ip(const char *str, IPADDR *ip); /* Start listening for incoming connections */ -GIOChannel *dcc_listen(GIOChannel *interface, IPADDR *ip, int *port); +GIOChannel *dcc_listen(GIOChannel *iface, IPADDR *ip, int *port); /* Close DCC - sends "dcc closed" signal and calls dcc_destroy() */ void dcc_close(DCC_REC *dcc); |