zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-17 15:42:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

simplify duplicate code in outgoing modify

Browse source
This commit is contained in:
Ailin Nemui 2021-10-10 13:03:36 +02:00
commit b22588a9ad
3 changed files with 39 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/irc/core/irc-servers.c
View file

@ -711,37 +711,12 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
}
}
static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
void irc_server_send_and_redirect(IRC_SERVER_REC *server, GString *str, REDIRECT_REC *redirect)
{
REDIRECT_REC *redirect;
GSList *link;
GString *str;
long usecs;
char *cmd;
int crlf;
if (!IS_IRC_SERVER(server))
return 0;
if (server->cmdcount == 0 && server->cmdqueue == NULL)
return 0;
if (now < server->wait_cmd)
return 1;
usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
if (usecs < server->cmd_queue_speed)
return 1;
server->cmdcount--;
if (server->cmdqueue == NULL) return 1;
/* get command */
cmd = server->cmdqueue->data;
redirect = server->cmdqueue->next->data;
/* send command */
str = g_string_new(cmd);
g_return_if_fail(server != NULL);
g_return_if_fail(str != NULL);
if (str->len > 2 && str->str[str->len - 2] == '\r')
crlf = 2;
@ -768,6 +743,40 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
rawlog_output(server->rawlog, str->str);
server_redirect_command(server, str->str, redirect);
}
}
static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
{
REDIRECT_REC *redirect;
GSList *link;
GString *str;
long usecs;
char *cmd;
if (!IS_IRC_SERVER(server))
return 0;
if (server->cmdcount == 0 && server->cmdqueue == NULL)
return 0;
if (now < server->wait_cmd)
return 1;
usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
if (usecs < server->cmd_queue_speed)
return 1;
server->cmdcount--;
if (server->cmdqueue == NULL)
return 1;
/* get command */
cmd = server->cmdqueue->data;
redirect = server->cmdqueue->next->data;
/* send command */
str = g_string_new(cmd);
irc_server_send_and_redirect(server, str, redirect);
g_string_free(str, TRUE);
/* remove from queue */