mirror of
https://github.com/irssi/irssi.git
synced 2026-08-21 17:42:49 +02:00
fix warning in cmd_ping
This commit is contained in:
parent
aab5349256
commit
a453065375
2 changed files with 5 additions and 4 deletions
|
|
@ -124,18 +124,18 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
|
||||||
const char *target)
|
const char *target)
|
||||||
{
|
{
|
||||||
gint64 tv, tv2;
|
gint64 tv, tv2;
|
||||||
long usecs;
|
long usecs, secs;
|
||||||
|
|
||||||
g_return_if_fail(data != NULL);
|
g_return_if_fail(data != NULL);
|
||||||
|
|
||||||
if (sscanf(data, "%ld %ld", &tv, &tv2) < 1) {
|
if (sscanf(data, "%ld %ld", &secs, &usecs) < 1) {
|
||||||
char *tmp = g_strconcat("PING ", data, NULL);
|
char *tmp = g_strconcat("PING ", data, NULL);
|
||||||
ctcp_default_reply(server, tmp, nick, addr, target);
|
ctcp_default_reply(server, tmp, nick, addr, target);
|
||||||
g_free(tmp);
|
g_free(tmp);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
tv2 += tv * G_TIME_SPAN_SECOND;
|
tv2 = secs * G_TIME_SPAN_SECOND + usecs;
|
||||||
tv = g_get_real_time();
|
tv = g_get_real_time();
|
||||||
usecs = tv - tv2;
|
usecs = tv - tv2;
|
||||||
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
||||||
|
|
|
||||||
|
|
@ -541,7 +541,8 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
|
||||||
|
|
||||||
tv = g_get_real_time();
|
tv = g_get_real_time();
|
||||||
|
|
||||||
str = g_strdup_printf("%s PING %ld %ld", data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
|
str = g_strdup_printf("%s PING %ld %ld", data, (long) (tv / G_TIME_SPAN_SECOND),
|
||||||
|
(long) (tv % G_TIME_SPAN_SECOND));
|
||||||
signal_emit("command ctcp", 3, str, server, item);
|
signal_emit("command ctcp", 3, str, server, item);
|
||||||
g_free(str);
|
g_free(str);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue