pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

irc: fix code style

Browse Source
This commit is contained in:
Sébastien Helleu
2018-05-20 17:07:04 +02:00
parent 108004be95
commit c8da268df1
2 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+49 -30
View File
@@ -338,48 +338,50 @@ IRC_PROTOCOL_CALLBACK(away)
* Callback for IRC server capabilities string length hashtable map.
*/
void irc_protocol_cap_length_cb (void *data,
struct t_hashtable *hashtable,
const char *key, const char *value)
void
irc_protocol_cap_length_cb (void *data,
struct t_hashtable *hashtable,
const char *key, const char *value)
{
int *length;
/* make C compiler happy */
(void) hashtable;
length = (int*)data;
*length += 1 + strlen (key); // separator + key
length = (int *)data;
*length += 1 + strlen (key); /* separator (space) + key */
if (value)
*length += 1 + strlen (value); // equals sign + value
*length += 1 + strlen (value); /* equals sign + value */
}
/*
* Callback for IRC server capabilities string hashtable map.
*/
void irc_protocol_cap_print_cb (void *data,
struct t_hashtable *hashtable,
const char *key, const char *value)
void
irc_protocol_cap_print_cb (void *data,
struct t_hashtable *hashtable,
const char *key, const char *value)
{
char *str, *pos;
char *str;
/* make C compiler happy */
(void) hashtable;
str = (char*)data;
pos = str + strlen (str);
str = (char *)data;
sprintf (pos, " %s%s%s",
sprintf (str + strlen (str), " %s%s%s",
key,
(value) ? "=" : "",
(value) ? value : "");
}
/*
* Synchronize requested capabilities for IRC server
* Synchronizes requested capabilities for IRC server.
*/
void irc_protocol_cap_sync (struct t_irc_server *server, int sasl)
void
irc_protocol_cap_sync (struct t_irc_server *server, int sasl)
{
char *cap_option, *cap_req, **caps_requested;
const char *ptr_cap_option;
@@ -568,6 +570,7 @@ IRC_PROTOCOL_CALLBACK(cap)
weechat_prefix ("network"),
IRC_PLUGIN_NAME,
str_caps);
free (str_caps);
}
}
@@ -633,7 +636,6 @@ IRC_PROTOCOL_CALLBACK(cap)
}
}
if (last_reply)
{
length = 0;
@@ -653,11 +655,11 @@ IRC_PROTOCOL_CALLBACK(cap)
server->buffer, date, NULL,
_("%s%s: client capability, currently enabled:%s"),
weechat_prefix ("network"), IRC_PLUGIN_NAME, str_caps);
free (str_caps);
}
}
if (caps_enabled)
weechat_string_free_split (caps_enabled);
}
@@ -678,7 +680,8 @@ IRC_PROTOCOL_CALLBACK(cap)
{
for (i = 0; i < num_caps_supported; i++)
{
weechat_hashtable_set (server->cap_list, caps_supported[i], NULL);
weechat_hashtable_set (server->cap_list,
caps_supported[i], NULL);
if (strcmp (caps_supported[i], "sasl") == 0)
{
@@ -762,9 +765,7 @@ IRC_PROTOCOL_CALLBACK(cap)
weechat_string_free_split (caps_added);
}
/*
* TODO: SASL Reauthentication
*/
/* TODO: SASL Reauthentication */
irc_protocol_cap_sync (server, 0);
}
}
@@ -4485,9 +4486,15 @@ IRC_PROTOCOL_CALLBACK(352)
{
if (ptr_nick->realname)
free (ptr_nick->realname);
ptr_nick->realname = (pos_realname &&
weechat_hashtable_has_key (server->cap_list, "extended-join")) ?
strdup (pos_realname) : NULL;
if (pos_realname &&
weechat_hashtable_has_key (server->cap_list, "extended-join"))
{
ptr_nick->realname = strdup (pos_realname);
}
else
{
ptr_nick->realname = NULL;
}
}
/* display output of who (manual who from user) */
@@ -4721,9 +4728,15 @@ IRC_PROTOCOL_CALLBACK(354)
{
if (ptr_nick->account)
free (ptr_nick->account);
ptr_nick->account = (ptr_channel && pos_account
&& weechat_hashtable_has_key (server->cap_list, "account-notify")) ?
strdup (pos_account) : NULL;
if (ptr_channel && pos_account
&& weechat_hashtable_has_key (server->cap_list, "account-notify"))
{
ptr_nick->account = strdup (pos_account);
}
else
{
ptr_nick->account = NULL;
}
}
/* update realname in nick */
@@ -4731,9 +4744,15 @@ IRC_PROTOCOL_CALLBACK(354)
{
if (ptr_nick->realname)
free (ptr_nick->realname);
ptr_nick->realname = (ptr_channel && pos_realname
&& weechat_hashtable_has_key (server->cap_list, "extended-join")) ?
strdup (pos_realname) : NULL;
if (ptr_channel && pos_realname
&& weechat_hashtable_has_key (server->cap_list, "extended-join"))
{
ptr_nick->realname = strdup (pos_realname);
}
else
{
ptr_nick->realname = NULL;
}
}
/* display output of who (manual who from user) */
src/plugins/irc/irc-server.c
+2 -1
View File
@@ -3359,7 +3359,8 @@ irc_server_timer_cb (const void *pointer, void *data, int remaining_calls)
/* check away (only if lag check was not done) */
away_check = IRC_SERVER_OPTION_INTEGER(
ptr_server, IRC_SERVER_OPTION_AWAY_CHECK);
if (!weechat_hashtable_has_key (ptr_server->cap_list, "away-notify")
if (!weechat_hashtable_has_key (ptr_server->cap_list,
"away-notify")
&& (away_check > 0)
&& ((ptr_server->last_away_check == 0)
|| (current_time >= ptr_server->last_away_check + (away_check * 60))))