pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-08 10:43:13 +02:00
Code Activity

api: return newly allocated string in functions string_tolower and string_toupper

Browse Source
This commit is contained in:
Sébastien Helleu
2022-12-18 14:10:10 +01:00
parent eb6cc0bc2a
commit 40339b288a
22 changed files with 281 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-channel.c
+1 -2
View File
@@ -399,10 +399,9 @@ irc_channel_create_buffer (struct t_irc_server *server,
channel_name_lower = NULL;
if (channel_type == IRC_CHANNEL_TYPE_CHANNEL)
{
channel_name_lower = strdup (channel_name);
channel_name_lower = weechat_string_tolower (channel_name);
if (channel_name_lower)
{
weechat_string_tolower (channel_name_lower);
manual_join = weechat_hashtable_has_key (server->join_manual,
channel_name_lower);
noswitch = weechat_hashtable_has_key (server->join_noswitch,
src/plugins/irc/irc-command.c
+1 -2
View File
@@ -2877,10 +2877,9 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
strcat (new_args, channels[i]);
if (manual_join || noswitch)
{
channel_name = strdup (pos_channel);
channel_name = weechat_string_tolower (pos_channel);
if (channel_name)
{
weechat_string_tolower (channel_name);
if (manual_join)
{
weechat_hashtable_set (server->join_manual,
src/plugins/irc/irc-protocol.c
+2 -8
View File
@@ -6730,15 +6730,12 @@ IRC_PROTOCOL_CALLBACK(470)
}
}
old_channel_lower = strdup (params[1]);
old_channel_lower = weechat_string_tolower (params[1]);
if (old_channel_lower)
{
weechat_string_tolower (old_channel_lower);
new_channel_lower = strdup (params[2]);
new_channel_lower = weechat_string_tolower (params[2]);
if (new_channel_lower)
{
weechat_string_tolower (new_channel_lower);
if (weechat_hashtable_has_key (server->join_manual,
old_channel_lower))
{
@@ -6750,7 +6747,6 @@ IRC_PROTOCOL_CALLBACK(470)
weechat_hashtable_remove (server->join_manual,
old_channel_lower);
}
if (weechat_hashtable_has_key (server->join_noswitch,
old_channel_lower))
{
@@ -6762,10 +6758,8 @@ IRC_PROTOCOL_CALLBACK(470)
weechat_hashtable_remove (server->join_noswitch,
old_channel_lower);
}
free (new_channel_lower);
}
free (old_channel_lower);
}
}
src/plugins/logger/logger.c
+9 -4
View File
@@ -297,7 +297,7 @@ logger_get_mask_for_buffer (struct t_gui_buffer *buffer)
char *
logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
{
char *mask2, *mask3, *mask4, *mask5, *mask6, *mask7, *dir_separator;
char *mask2, *mask3, *mask4, *mask5, *mask6, *mask7, *mask8, *dir_separator;
int length;
time_t seconds;
struct tm *date_tmp;
@@ -308,6 +308,7 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
mask5 = NULL;
mask6 = NULL;
mask7 = NULL;
mask8 = NULL;
dir_separator = weechat_info_get ("dir_separator", "");
if (!dir_separator)
@@ -360,7 +361,9 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
/* convert to lower case? */
if (weechat_config_boolean (logger_config_file_name_lower_case))
weechat_string_tolower (mask7);
mask8 = weechat_string_tolower (mask7);
else
mask8 = strdup (mask7);
if (weechat_logger_plugin->debug)
{
@@ -369,7 +372,7 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
"decoded mask = \"%s\"",
LOGGER_PLUGIN_NAME,
weechat_buffer_get_string (buffer, "name"),
mask, mask7);
mask, mask8);
}
end:
@@ -384,8 +387,10 @@ end:
free (mask5);
if (mask6)
free (mask6);
if (mask7)
free (mask7);
return mask7;
return mask8;
}
/*
src/plugins/plugin-config.c
+15 -6
View File
@@ -111,7 +111,7 @@ plugin_config_set (const char *plugin_name, const char *option_name,
const char *value)
{
int length, rc;
char *option_full_name;
char *option_full_name, *option_full_name_lower;
rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
@@ -121,8 +121,12 @@ plugin_config_set (const char *plugin_name, const char *option_name,
{
snprintf (option_full_name, length, "%s.%s",
plugin_name, option_name);
string_tolower (option_full_name);
rc = plugin_config_set_internal (option_full_name, value);
option_full_name_lower = string_tolower (option_full_name);
if (option_full_name_lower)
{
rc = plugin_config_set_internal (option_full_name_lower, value);
free (option_full_name_lower);
}
free (option_full_name);
}
@@ -199,7 +203,7 @@ plugin_config_set_desc (const char *plugin_name, const char *option_name,
const char *description)
{
int length;
char *option_full_name;
char *option_full_name, *option_full_name_lower;
length = strlen (plugin_name) + 1 + strlen (option_name) + 1;
option_full_name = malloc (length);
@@ -207,8 +211,13 @@ plugin_config_set_desc (const char *plugin_name, const char *option_name,
{
snprintf (option_full_name, length, "%s.%s",
plugin_name, option_name);
string_tolower (option_full_name);
plugin_config_set_desc_internal (option_full_name, description);
option_full_name_lower = string_tolower (option_full_name);
if (option_full_name_lower)
{
plugin_config_set_desc_internal (option_full_name_lower,
description);
free (option_full_name_lower);
}
free (option_full_name);
}
}
src/plugins/relay/irc/relay-irc.c
+10 -6
View File
@@ -1330,7 +1330,7 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
const char *irc_command, *str_num_params, *isupport, *pos_password;
char str_time[128], str_signal[128], str_server_channel[256], *nick;
char str_param[128], *str_args, *version, str_command[128], **params;
char *pos, *password, *irc_is_channel, *info, *error;
char *pos, *password, *irc_is_channel, *info, *error, *str_cmd_lower;
long num_params;
int i, redirect_msg;
@@ -1766,11 +1766,15 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
redirect_msg = 1;
snprintf (str_command, sizeof (str_command),
"%s", irc_command);
weechat_string_tolower (str_command);
weechat_hashtable_set (hash_redirect, "pattern",
str_command);
weechat_hashtable_set (hash_redirect, "string",
params[0]);
str_cmd_lower = weechat_string_tolower (str_command);
if (str_cmd_lower)
{
weechat_hashtable_set (hash_redirect, "pattern",
str_cmd_lower);
weechat_hashtable_set (hash_redirect, "string",
params[0]);
free (str_cmd_lower);
}
}
}
else if (weechat_strcasecmp (irc_command, "time") == 0)
src/plugins/relay/relay-websocket.c
+9 -3
View File
@@ -72,7 +72,7 @@ void
relay_websocket_save_header (struct t_relay_client *client,
const char *message)
{
char *pos, *name;
char *pos, *name, *name_lower;
const char *ptr_value;
/* ignore the "GET" request */
@@ -89,7 +89,12 @@ relay_websocket_save_header (struct t_relay_client *client,
name = weechat_strndup (message, pos - message);
if (!name)
return;
weechat_string_tolower (name);
name_lower = weechat_string_tolower (name);
if (!name_lower)
{
free (name);
return;
}
/* get pointer on header value */
ptr_value = pos + 1;
@@ -99,9 +104,10 @@ relay_websocket_save_header (struct t_relay_client *client,
}
/* add header in the hashtable */
weechat_hashtable_set (client->http_headers, name, ptr_value);
weechat_hashtable_set (client->http_headers, name_lower, ptr_value);
free (name);
free (name_lower);
}
/*
src/plugins/script/script-repo.c
+1 -2
View File
@@ -760,9 +760,8 @@ script_repo_sha512sum_file (const char *filename)
return NULL;
weechat_string_base_encode (16, hash, hash_size, hash_hexa);
weechat_string_tolower (hash_hexa);
return strdup (hash_hexa);
return weechat_string_tolower (hash_hexa);
}
/*
src/plugins/weechat-plugin.h
+3 -3
View File
@@ -68,7 +68,7 @@ struct timeval;
* please change the date with current one; for a second change at same
* date, increment the 01, otherwise please keep 01.
*/
#define WEECHAT_PLUGIN_API_VERSION "20221203-01"
#define WEECHAT_PLUGIN_API_VERSION "20221218-01"
/* macros for defining plugin infos */
#define WEECHAT_PLUGIN_NAME(__name) \
@@ -287,8 +287,8 @@ struct t_weechat_plugin
char *(*strndup) (const char *string, int bytes);
char *(*string_cut) (const char *string, int length, int count_suffix,
int screen, const char *cut_suffix);
void (*string_tolower) (char *string);
void (*string_toupper) (char *string);
char *(*string_tolower) (const char *string);
char *(*string_toupper) (const char *string);
int (*strcasecmp) (const char *string1, const char *string2);
int (*strcasecmp_range) (const char *string1, const char *string2,
int range);