mirror of
https://github.com/weechat/weechat.git
synced 2026-07-09 19:23:13 +02:00
Fix typo: splited/splitted -> split
This commit is contained in:
@@ -4033,7 +4033,7 @@ command_startup (int plugins_loaded)
|
||||
{
|
||||
input_data (weechat_buffer, *ptr_cmd);
|
||||
}
|
||||
string_free_splitted_command (commands);
|
||||
string_free_split_command (commands);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1409,7 +1409,7 @@ config_weechat_init_options ()
|
||||
config_color_separator = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"separator", "color",
|
||||
N_("background color for window separators (when splitted)"),
|
||||
N_("background color for window separators (when split)"),
|
||||
NULL, GUI_COLOR_SEPARATOR, 0, "blue", NULL, 0,
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
/* bar colors */
|
||||
|
||||
@@ -1008,20 +1008,20 @@ string_split_command (const char *command, char separator)
|
||||
}
|
||||
|
||||
/*
|
||||
* string_free_splitted_command : free a list of commands splitted
|
||||
* with string_split_command
|
||||
* string_free_split_command : free a list of commands split
|
||||
* with string_split_command
|
||||
*/
|
||||
|
||||
void
|
||||
string_free_splitted_command (char **splitted_command)
|
||||
string_free_split_command (char **split_command)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (splitted_command)
|
||||
if (split_command)
|
||||
{
|
||||
for (i = 0; splitted_command[i]; i++)
|
||||
free (splitted_command[i]);
|
||||
free (splitted_command);
|
||||
for (i = 0; split_command[i]; i++)
|
||||
free (split_command[i]);
|
||||
free (split_command);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ extern void string_free_exploded (char **exploded_string);
|
||||
extern char *string_build_with_exploded (const char **exploded_string,
|
||||
const char *separator);
|
||||
extern char **string_split_command (const char *command, char separator);
|
||||
extern void string_free_splitted_command (char **splitted_command);
|
||||
extern void string_free_split_command (char **split_command);
|
||||
extern char *string_iconv (int from_utf8, const char *from_code,
|
||||
const char *to_code, const char *string);
|
||||
extern char *string_iconv_to_internal (const char *charset, const char *string);
|
||||
|
||||
@@ -42,7 +42,7 @@ struct t_gui_bar_window;
|
||||
struct t_gui_window_curses_objects
|
||||
{
|
||||
WINDOW *win_chat; /* chat window (example: channel) */
|
||||
WINDOW *win_separator; /* separation between 2 splitted (V) win*/
|
||||
WINDOW *win_separator; /* separation between 2 split (V) win */
|
||||
};
|
||||
|
||||
struct t_gui_bar_window_curses_objects
|
||||
|
||||
+20
-20
@@ -436,7 +436,7 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
|
||||
{
|
||||
enum t_gui_bar_filling filling;
|
||||
char *ptr_content, *content, reinit_color[32], reinit_color_space[32];
|
||||
char *item_value, ****splitted_items, **linear_items;
|
||||
char *item_value, ****split_items, **linear_items;
|
||||
int index_content, content_length, i, sub, j, k, index;
|
||||
int length_reinit_color, length_reinit_color_space;
|
||||
int length, max_length, max_length_screen, total_items, columns, lines;
|
||||
@@ -521,39 +521,39 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
|
||||
total_items = 0;
|
||||
max_length = 1;
|
||||
max_length_screen = 1;
|
||||
splitted_items = malloc(bar_window->items_count * sizeof(*splitted_items));
|
||||
split_items = malloc(bar_window->items_count * sizeof(*split_items));
|
||||
for (i = 0; i < bar_window->items_count; i++)
|
||||
{
|
||||
if (bar_window->items_subcount[i] > 0)
|
||||
{
|
||||
splitted_items[i] = malloc (bar_window->items_subcount[i] * sizeof (**splitted_items));
|
||||
split_items[i] = malloc (bar_window->items_subcount[i] * sizeof (**split_items));
|
||||
for (sub = 0; sub < bar_window->items_subcount[i]; sub++)
|
||||
{
|
||||
ptr_content = gui_bar_window_content_get (bar_window, window,
|
||||
i, sub);
|
||||
if (ptr_content && ptr_content[0])
|
||||
{
|
||||
splitted_items[i][sub] = string_explode (ptr_content,
|
||||
"\n", 0, 0, NULL);
|
||||
for (j = 0; splitted_items[i][sub][j]; j++)
|
||||
split_items[i][sub] = string_explode (ptr_content,
|
||||
"\n", 0, 0, NULL);
|
||||
for (j = 0; split_items[i][sub][j]; j++)
|
||||
{
|
||||
total_items++;
|
||||
|
||||
length = strlen (splitted_items[i][sub][j]);
|
||||
length = strlen (split_items[i][sub][j]);
|
||||
if (length > max_length)
|
||||
max_length = length;
|
||||
|
||||
length = gui_chat_strlen_screen (splitted_items[i][sub][j]);
|
||||
length = gui_chat_strlen_screen (split_items[i][sub][j]);
|
||||
if (length > max_length_screen)
|
||||
max_length_screen = length;
|
||||
}
|
||||
}
|
||||
else
|
||||
splitted_items[i] = NULL;
|
||||
split_items[i] = NULL;
|
||||
}
|
||||
}
|
||||
else
|
||||
splitted_items[i] = NULL;
|
||||
split_items[i] = NULL;
|
||||
}
|
||||
if ((CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_POSITION]) == GUI_BAR_POSITION_BOTTOM)
|
||||
|| (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_POSITION]) == GUI_BAR_POSITION_TOP))
|
||||
@@ -573,7 +573,7 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
|
||||
lines = bar_window->height;
|
||||
}
|
||||
|
||||
/* build array with pointers to splitted items */
|
||||
/* build array with pointers to split items */
|
||||
|
||||
linear_items = malloc (total_items * sizeof (*linear_items));
|
||||
if (linear_items)
|
||||
@@ -581,15 +581,15 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
|
||||
index = 0;
|
||||
for (i = 0; i < bar_window->items_count; i++)
|
||||
{
|
||||
if (splitted_items[i])
|
||||
if (split_items[i])
|
||||
{
|
||||
for (sub = 0; sub < bar_window->items_subcount[i]; sub++)
|
||||
{
|
||||
if (splitted_items[i][sub])
|
||||
if (split_items[i][sub])
|
||||
{
|
||||
for (j = 0; splitted_items[i][sub][j]; j++)
|
||||
for (j = 0; split_items[i][sub][j]; j++)
|
||||
{
|
||||
linear_items[index++] = splitted_items[i][sub][j];
|
||||
linear_items[index++] = split_items[i][sub][j];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -647,17 +647,17 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
|
||||
|
||||
for (i = 0; i < bar_window->items_count; i++)
|
||||
{
|
||||
if (splitted_items[i])
|
||||
if (split_items[i])
|
||||
{
|
||||
for (sub = 0; sub < bar_window->items_subcount[i]; sub++)
|
||||
{
|
||||
if (splitted_items[i][sub])
|
||||
string_free_exploded (splitted_items[i][sub]);
|
||||
if (split_items[i][sub])
|
||||
string_free_exploded (split_items[i][sub]);
|
||||
}
|
||||
free (splitted_items[i]);
|
||||
free (split_items[i]);
|
||||
}
|
||||
}
|
||||
free (splitted_items);
|
||||
free (split_items);
|
||||
break;
|
||||
case GUI_BAR_NUM_FILLING:
|
||||
break;
|
||||
|
||||
@@ -504,7 +504,7 @@ gui_keyboard_pressed (const char *key_str)
|
||||
input_data (gui_current_window->buffer,
|
||||
*ptr_cmd);
|
||||
}
|
||||
string_free_splitted_command (commands);
|
||||
string_free_split_command (commands);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -344,7 +344,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
|
||||
}
|
||||
}
|
||||
ptr_alias->running = 0;
|
||||
weechat_string_free_splitted_command (commands);
|
||||
weechat_string_free_split_command (commands);
|
||||
}
|
||||
}
|
||||
return WEECHAT_RC_OK;
|
||||
|
||||
@@ -2473,7 +2473,7 @@ irc_protocol_cmd_001 (struct t_irc_server *server, const char *command,
|
||||
if (vars_replaced)
|
||||
free (vars_replaced);
|
||||
}
|
||||
weechat_string_free_splitted_command (commands);
|
||||
weechat_string_free_split_command (commands);
|
||||
}
|
||||
|
||||
if (IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_COMMAND_DELAY) > 0)
|
||||
|
||||
@@ -368,7 +368,7 @@ plugin_load (const char *filename)
|
||||
new_plugin->string_free_exploded = &string_free_exploded;
|
||||
new_plugin->string_build_with_exploded = &string_build_with_exploded;
|
||||
new_plugin->string_split_command = &string_split_command;
|
||||
new_plugin->string_free_splitted_command = &string_free_splitted_command;
|
||||
new_plugin->string_free_split_command = &string_free_split_command;
|
||||
new_plugin->string_format_size = &string_format_size;
|
||||
new_plugin->string_remove_color = &gui_color_decode;
|
||||
|
||||
|
||||
@@ -367,7 +367,7 @@ c_split_multi_command (char *command, char sep)
|
||||
}
|
||||
|
||||
/*
|
||||
* c_free_multi_command : free a list of commands splitted
|
||||
* c_free_multi_command : free a list of commands split
|
||||
* with split_multi_command
|
||||
*/
|
||||
|
||||
|
||||
@@ -165,7 +165,7 @@ struct t_weechat_plugin
|
||||
char *(*string_build_with_exploded) (const char **exploded_string,
|
||||
const char *separator);
|
||||
char **(*string_split_command) (const char *command, char separator);
|
||||
void (*string_free_splitted_command) (char **splitted_command);
|
||||
void (*string_free_split_command) (char **split_command);
|
||||
char *(*string_format_size) (unsigned long size);
|
||||
char *(*string_remove_color) (const char *string, const char *replacement);
|
||||
|
||||
@@ -695,8 +695,8 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
|
||||
__separator)
|
||||
#define weechat_string_split_command(__command, __separator) \
|
||||
weechat_plugin->string_split_command(__command, __separator)
|
||||
#define weechat_string_free_splitted_command(__splitted_command) \
|
||||
weechat_plugin->string_free_splitted_command(__splitted_command)
|
||||
#define weechat_string_free_split_command(__split_command) \
|
||||
weechat_plugin->string_free_split_command(__split_command)
|
||||
#define weechat_string_format_size(__size) \
|
||||
weechat_plugin->string_format_size(__size)
|
||||
#define weechat_string_remove_color(__string, __replacement) \
|
||||
|
||||
Reference in New Issue
Block a user