projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to improve portability (especially to OS X, Solaris, OpenBSD).
[ircu2.10.12-pk.git]
/
ircd
/
uping.c
diff --git
a/ircd/uping.c
b/ircd/uping.c
index 8f8965365d227a5b9646f3bcbcc4f1247c130477..3c9ea1e1de233d34e6149ced2082733de10d98a3 100644
(file)
--- a/
ircd/uping.c
+++ b/
ircd/uping.c
@@
-193,7
+193,7
@@
static void uping_read_callback(struct Event* ev)
assert(0 != ev_socket(ev));
assert(0 != s_data(ev_socket(ev)));
assert(0 != ev_socket(ev));
assert(0 != s_data(ev_socket(ev)));
- pptr = s_data(ev_socket(ev));
+ pptr =
(struct UPing*)
s_data(ev_socket(ev));
Debug((DEBUG_SEND, "uping_read_callback called, %p (%d)", pptr,
ev_type(ev)));
Debug((DEBUG_SEND, "uping_read_callback called, %p (%d)", pptr,
ev_type(ev)));
@@
-218,7
+218,7
@@
static void uping_sender_callback(struct Event* ev)
assert(0 != ev_timer(ev));
assert(0 != t_data(ev_timer(ev)));
assert(0 != ev_timer(ev));
assert(0 != t_data(ev_timer(ev)));
- pptr = t_data(ev_timer(ev));
+ pptr =
(struct UPing*)
t_data(ev_timer(ev));
Debug((DEBUG_SEND, "uping_sender_callback called, %p (%d)", pptr,
ev_type(ev)));
Debug((DEBUG_SEND, "uping_sender_callback called, %p (%d)", pptr,
ev_type(ev)));
@@
-247,7
+247,7
@@
static void uping_killer_callback(struct Event* ev)
assert(0 != ev_timer(ev));
assert(0 != t_data(ev_timer(ev)));
assert(0 != ev_timer(ev));
assert(0 != t_data(ev_timer(ev)));
- pptr = t_data(ev_timer(ev));
+ pptr =
(struct UPing*)
t_data(ev_timer(ev));
Debug((DEBUG_SEND, "uping_killer_callback called, %p (%d)", pptr,
ev_type(ev)));
Debug((DEBUG_SEND, "uping_killer_callback called, %p (%d)", pptr,
ev_type(ev)));
@@
-298,7
+298,7
@@
void uping_send(struct UPing* pptr)
memset(buf, 0, sizeof(buf));
gettimeofday(&tv, NULL);
memset(buf, 0, sizeof(buf));
gettimeofday(&tv, NULL);
- sprintf(buf, " %10lu%c%6lu",
tv.tv_sec, '\0',
tv.tv_usec);
+ sprintf(buf, " %10lu%c%6lu",
(unsigned long)tv.tv_sec, '\0', (unsigned long)
tv.tv_usec);
Debug((DEBUG_SEND, "send_ping: sending [%s %s] to %s.%d on %d",
buf, &buf[12],
Debug((DEBUG_SEND, "send_ping: sending [%s %s] to %s.%d on %d",
buf, &buf[12],