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

core, plugins: replace calls to string_str(n)cmp by str(n)cmp (issue #1872)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-01-27 21:45:49 +01:00
parent c07cf691ad
commit fbeab26a35
41 changed files with 388 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/exec/exec.c
+2 -3
View File
@@ -65,7 +65,7 @@ exec_search_color (const char *color)
for (i = 0; i < EXEC_NUM_COLORS; i++)
{
if (weechat_strcmp (exec_color_string[i], color) == 0)
if (strcmp (exec_color_string[i], color) == 0)
return i;
}
@@ -726,8 +726,7 @@ exec_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, EXEC_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, EXEC_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/fset/fset.c
+1 -2
View File
@@ -65,8 +65,7 @@ fset_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, FSET_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, FSET_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/guile/weechat-guile.c
+2 -3
View File
@@ -1011,7 +1011,7 @@ weechat_guile_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "guile_script") == 0)
if (strcmp (infolist_name, "guile_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_guile_plugin,
guile_scripts, obj_pointer,
@@ -1036,8 +1036,7 @@ weechat_guile_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, GUILE_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, GUILE_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_guile_plugin, guile_scripts);
}
src/plugins/irc/irc-debug.c
+1 -2
View File
@@ -45,8 +45,7 @@ irc_debug_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, IRC_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, IRC_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/irc/irc-ignore.c
+1 -1
View File
@@ -180,7 +180,7 @@ irc_ignore_check_server (struct t_irc_ignore *ignore, const char *server)
if (strcmp (ignore->server, "*") == 0)
return 1;
return (weechat_strcmp (ignore->server, server) == 0) ? 1 : 0;
return (server && (strcmp (ignore->server, server) == 0)) ? 1 : 0;
}
/*
src/plugins/javascript/weechat-js.cpp
+2 -3
View File
@@ -794,7 +794,7 @@ weechat_js_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "javascript_script") == 0)
if (strcmp (infolist_name, "javascript_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_js_plugin,
js_scripts, obj_pointer,
@@ -819,8 +819,7 @@ weechat_js_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, JS_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, JS_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_js_plugin, js_scripts);
}
src/plugins/lua/weechat-lua.c
+2 -3
View File
@@ -1110,7 +1110,7 @@ weechat_lua_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "lua_script") == 0)
if (strcmp (infolist_name, "lua_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_lua_plugin,
lua_scripts, obj_pointer,
@@ -1135,8 +1135,7 @@ weechat_lua_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, LUA_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, LUA_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_lua_plugin, lua_scripts);
}
src/plugins/perl/weechat-perl.c
+2 -3
View File
@@ -1093,7 +1093,7 @@ weechat_perl_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "perl_script") == 0)
if (strcmp (infolist_name, "perl_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_perl_plugin,
perl_scripts, obj_pointer,
@@ -1118,8 +1118,7 @@ weechat_perl_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, PERL_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, PERL_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_perl_plugin, perl_scripts);
}
src/plugins/php/weechat-php.c
+2 -3
View File
@@ -1113,7 +1113,7 @@ weechat_php_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "php_script") == 0)
if (strcmp (infolist_name, "php_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_php_plugin,
php_scripts, obj_pointer,
@@ -1138,8 +1138,7 @@ weechat_php_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, PHP_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, PHP_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_php_plugin, php_scripts);
}
src/plugins/plugin.c
+8 -5
View File
@@ -128,7 +128,7 @@ plugin_search (const char *name)
for (ptr_plugin = weechat_plugins; ptr_plugin;
ptr_plugin = ptr_plugin->next_plugin)
{
if (string_strcmp (ptr_plugin->name, name) == 0)
if (strcmp (ptr_plugin->name, name) == 0)
return ptr_plugin;
}
@@ -166,14 +166,17 @@ plugin_check_extension_allowed (const char *filename)
if (!config_plugin_extensions)
return 1;
if (!filename)
return 0;
length = strlen (filename);
for (i = 0; i < config_num_plugin_extensions; i++)
{
length_ext = strlen (config_plugin_extensions[i]);
if (length >= length_ext)
{
if (string_strcmp (filename + length - length_ext,
config_plugin_extensions[i]) == 0)
if (strcmp (filename + length - length_ext,
config_plugin_extensions[i]) == 0)
{
/* extension allowed */
return 1;
@@ -235,8 +238,8 @@ plugin_check_autoload (const char *filename)
length_ext = strlen (config_plugin_extensions[i]);
if (length >= length_ext)
{
if (string_strcmp (base_name + length - length_ext,
config_plugin_extensions[i]) == 0)
if (strcmp (base_name + length - length_ext,
config_plugin_extensions[i]) == 0)
{
plugin_name = string_strndup (base_name, length - length_ext);
break;
src/plugins/python/weechat-python.c
+2 -3
View File
@@ -1336,7 +1336,7 @@ weechat_python_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "python_script") == 0)
if (strcmp (infolist_name, "python_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_python_plugin,
python_scripts,
@@ -1362,8 +1362,7 @@ weechat_python_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, PYTHON_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, PYTHON_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_python_plugin, python_scripts);
}
src/plugins/relay/relay.c
+1 -2
View File
@@ -173,8 +173,7 @@ relay_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, RELAY_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, RELAY_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/ruby/weechat-ruby.c
+2 -3
View File
@@ -1147,7 +1147,7 @@ weechat_ruby_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "ruby_script") == 0)
if (strcmp (infolist_name, "ruby_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_ruby_plugin,
ruby_scripts, obj_pointer,
@@ -1172,8 +1172,7 @@ weechat_ruby_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, RUBY_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, RUBY_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_ruby_plugin, ruby_scripts);
}
src/plugins/script/script.c
+1 -2
View File
@@ -249,8 +249,7 @@ script_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, SCRIPT_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, SCRIPT_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/spell/spell.c
+1 -1
View File
@@ -351,7 +351,7 @@ spell_command_authorized (const char *command)
for (i = 0; i < spell_count_commands_to_check; i++)
{
if ((spell_length_commands_to_check[i] == length_command)
&& (weechat_strcmp (command, spell_commands_to_check[i]) == 0))
&& (strcmp (command, spell_commands_to_check[i]) == 0))
{
/* command is authorized */
return 1;
src/plugins/tcl/weechat-tcl.c
+2 -3
View File
@@ -795,7 +795,7 @@ weechat_tcl_infolist_cb (const void *pointer, void *data,
if (!infolist_name || !infolist_name[0])
return NULL;
if (weechat_strcmp (infolist_name, "tcl_script") == 0)
if (strcmp (infolist_name, "tcl_script") == 0)
{
return plugin_script_infolist_list_scripts (weechat_tcl_plugin,
tcl_scripts, obj_pointer,
@@ -820,8 +820,7 @@ weechat_tcl_signal_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, TCL_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, TCL_PLUGIN_NAME) == 0))
{
plugin_script_print_log (weechat_tcl_plugin, tcl_scripts);
}
src/plugins/trigger/trigger.c
+1 -2
View File
@@ -1362,8 +1362,7 @@ trigger_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, TRIGGER_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, TRIGGER_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",
src/plugins/xfer/xfer.c
+8 -6
View File
@@ -244,15 +244,18 @@ xfer_search_protocol (const char *protocol)
*/
struct t_xfer *
xfer_search (const char *plugin_name, const char *plugin_id, enum t_xfer_type type,
enum t_xfer_status status, int port)
xfer_search (const char *plugin_name, const char *plugin_id,
enum t_xfer_type type, enum t_xfer_status status, int port)
{
struct t_xfer *ptr_xfer;
if (!plugin_name || !plugin_id)
return NULL;
for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer)
{
if ((weechat_strcmp (ptr_xfer->plugin_name, plugin_name) == 0)
&& (weechat_strcmp (ptr_xfer->plugin_id, plugin_id) == 0)
if ((strcmp (ptr_xfer->plugin_name, plugin_name) == 0)
&& (strcmp (ptr_xfer->plugin_id, plugin_id) == 0)
&& (ptr_xfer->type == type)
&& (ptr_xfer->status = status)
&& (ptr_xfer->port == port))
@@ -1759,8 +1762,7 @@ xfer_debug_dump_cb (const void *pointer, void *data,
(void) signal;
(void) type_data;
if (!signal_data
|| (weechat_strcmp ((char *)signal_data, XFER_PLUGIN_NAME) == 0))
if (!signal_data || (strcmp ((char *)signal_data, XFER_PLUGIN_NAME) == 0))
{
weechat_log_printf ("");
weechat_log_printf ("***** \"%s\" plugin dump *****",