summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2014-12-14 13:01:40 +0100
committerSébastien Helleu <flashcode@flashtux.org>2014-12-14 13:01:40 +0100
commit8d3a55c6be20768e85bf9ac5f06174f56463a282 (patch)
treef5de268a0aa3d5f5108e848a628416aa0dd7c41b
parent27817908f4232c01f6e7e9ed240aca5c04f579ce (diff)
downloadweechat-8d3a55c6be20768e85bf9ac5f06174f56463a282.zip
irc: rename argument with new server name in function irc_server_rename()
-rw-r--r--src/plugins/irc/irc-server.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index d962bb11f..6016b7da0 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1622,7 +1622,7 @@ irc_server_copy (struct t_irc_server *server, const char *new_name)
*/
int
-irc_server_rename (struct t_irc_server *server, const char *new_server_name)
+irc_server_rename (struct t_irc_server *server, const char *new_name)
{
int length;
char *mask, *pos_option, *new_option_name, *buffer_name;
@@ -1633,7 +1633,7 @@ irc_server_rename (struct t_irc_server *server, const char *new_server_name)
struct t_irc_channel *ptr_channel;
/* check if another server exists with this name */
- if (irc_server_casesearch (new_server_name))
+ if (irc_server_casesearch (new_name))
return 0;
/* rename options */
@@ -1659,12 +1659,12 @@ irc_server_rename (struct t_irc_server *server, const char *new_server_name)
if (pos_option)
{
pos_option++;
- length = strlen (new_server_name) + 1 + strlen (pos_option) + 1;
+ length = strlen (new_name) + 1 + strlen (pos_option) + 1;
new_option_name = malloc (length);
if (new_option_name)
{
snprintf (new_option_name, length,
- "%s.%s", new_server_name, pos_option);
+ "%s.%s", new_name, pos_option);
weechat_config_option_rename (ptr_option, new_option_name);
free (new_option_name);
}
@@ -1678,7 +1678,7 @@ irc_server_rename (struct t_irc_server *server, const char *new_server_name)
/* rename server */
if (server->name)
free (server->name);
- server->name = strdup (new_server_name);
+ server->name = strdup (new_name);
/* change name and local variables on buffers */
for (ptr_channel = server->channels; ptr_channel;