aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Clean up some GTimeVal juggling

Browse Source
This commit is contained in:
LemonBoy 2016-06-05 16:48:27 +02:00
parent e0b290c34f
commit cc70e8c581
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/irc/core/irc-servers.c
View File

@ -212,7 +212,6 @@ static void server_init(IRC_SERVER_REC *server)
{ {
IRC_SERVER_CONNECT_REC *conn; IRC_SERVER_CONNECT_REC *conn;
char *address, *ptr, *username, *cmd; char *address, *ptr, *username, *cmd;
GTimeVal now;
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
@ -287,9 +286,8 @@ static void server_init(IRC_SERVER_REC *server)
/* prevent the queue from sending too early, we have a max cut off of 120 secs */ /* prevent the queue from sending too early, we have a max cut off of 120 secs */
/* this will reset to 1 sec after we get the 001 event */ /* this will reset to 1 sec after we get the 001 event */
g_get_current_time(&now); g_get_current_time(&server->wait_cmd);
memcpy(&((IRC_SERVER_REC *)server)->wait_cmd, &now, sizeof(GTimeVal)); g_time_val_add(&server->wait_cmd, 120 * G_USEC_PER_SEC);
((IRC_SERVER_REC *)server)->wait_cmd.tv_sec += 120;
} }
SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn) SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
@ -535,7 +533,7 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
server->wait_cmd.tv_sec = 0; server->wait_cmd.tv_sec = 0;
else { else {
memcpy(&server->wait_cmd, &server->last_cmd, sizeof(GTimeVal)); memcpy(&server->wait_cmd, &server->last_cmd, sizeof(GTimeVal));
server->wait_cmd.tv_sec += 2 + len/100; g_time_val_add(&server->wait_cmd, (2 + len/100) * G_USEC_PER_SEC);
} }
} }
@ -695,7 +693,6 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
static void event_connected(IRC_SERVER_REC *server, const char *data, const char *from) static void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
char *params, *nick; char *params, *nick;
GTimeVal now;
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
@ -718,8 +715,7 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char
server->real_connect_time = time(NULL); server->real_connect_time = time(NULL);
/* let the queue send now that we are identified */ /* let the queue send now that we are identified */
g_get_current_time(&now); g_get_current_time(&server->wait_cmd);
memcpy(&server->wait_cmd, &now, sizeof(GTimeVal));
if (server->connrec->usermode != NULL) { if (server->connrec->usermode != NULL) {
/* Send the user mode, before the autosendcmd. /* Send the user mode, before the autosendcmd.