summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimmo Saan <simmo.saan@gmail.com>2017-06-03 12:28:00 +0300
committerSimmo Saan <simmo.saan@gmail.com>2017-06-03 15:56:26 +0300
commit996aaf061368c86c45e1d43a8c81e65ece16873e (patch)
treea0c7cd350ce00ab145b1d5ac6febcb1d148ee668 /src
parentec13a66af3f766e4f559d884f34e8cbbee26df3f (diff)
downloadweechat-996aaf061368c86c45e1d43a8c81e65ece16873e.zip
relay: remove local variables used only for sizeof
Diffstat (limited to 'src')
-rw-r--r--src/plugins/relay/irc/relay-irc.c7
-rw-r--r--src/plugins/relay/weechat/relay-weechat.c6
2 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/relay/irc/relay-irc.c b/src/plugins/relay/irc/relay-irc.c
index a088646d3..99fb0f32b 100644
--- a/src/plugins/relay/irc/relay-irc.c
+++ b/src/plugins/relay/irc/relay-irc.c
@@ -1773,13 +1773,12 @@ relay_irc_close_connection (struct t_relay_client *client)
void
relay_irc_alloc (struct t_relay_client *client)
{
- struct t_relay_irc_data *irc_data;
char *password;
password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
NULL, NULL, NULL);
- client->protocol_data = malloc (sizeof (*irc_data));
+ client->protocol_data = malloc (sizeof (struct t_relay_irc_data));
if (client->protocol_data)
{
RELAY_IRC_DATA(client, address) = strdup ("weechat.relay.irc");
@@ -1810,9 +1809,7 @@ void
relay_irc_alloc_with_infolist (struct t_relay_client *client,
struct t_infolist *infolist)
{
- struct t_relay_irc_data *irc_data;
-
- client->protocol_data = malloc (sizeof (*irc_data));
+ client->protocol_data = malloc (sizeof (struct t_relay_irc_data));
if (client->protocol_data)
{
RELAY_IRC_DATA(client, address) = strdup (weechat_infolist_string (infolist, "address"));
diff --git a/src/plugins/relay/weechat/relay-weechat.c b/src/plugins/relay/weechat/relay-weechat.c
index 2b3ccab7c..84f1e73c4 100644
--- a/src/plugins/relay/weechat/relay-weechat.c
+++ b/src/plugins/relay/weechat/relay-weechat.c
@@ -166,13 +166,12 @@ relay_weechat_free_buffers_nicklist (struct t_hashtable *hashtable,
void
relay_weechat_alloc (struct t_relay_client *client)
{
- struct t_relay_weechat_data *weechat_data;
char *password;
password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
NULL, NULL, NULL);
- client->protocol_data = malloc (sizeof (*weechat_data));
+ client->protocol_data = malloc (sizeof (struct t_relay_weechat_data));
if (client->protocol_data)
{
RELAY_WEECHAT_DATA(client, password_ok) = (password && password[0]) ? 0 : 1;
@@ -212,12 +211,11 @@ void
relay_weechat_alloc_with_infolist (struct t_relay_client *client,
struct t_infolist *infolist)
{
- struct t_relay_weechat_data *weechat_data;
int index, value;
char name[64];
const char *key;
- client->protocol_data = malloc (sizeof (*weechat_data));
+ client->protocol_data = malloc (sizeof (struct t_relay_weechat_data));
if (client->protocol_data)
{
/* general stuff */