summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hook/wee-hook-hsignal.c2
-rw-r--r--src/core/hook/wee-hook-line.c2
-rw-r--r--src/core/hook/wee-hook-signal.c2
-rw-r--r--src/core/wee-command.c2
-rw-r--r--src/core/wee-config-file.c2
-rw-r--r--src/core/wee-dir.c2
-rw-r--r--src/core/wee-input.c2
-rw-r--r--src/core/wee-string.c6
-rw-r--r--src/core/wee-string.h4
9 files changed, 12 insertions, 12 deletions
diff --git a/src/core/hook/wee-hook-hsignal.c b/src/core/hook/wee-hook-hsignal.c
index a9856fbb3..37dfa32a8 100644
--- a/src/core/hook/wee-hook-hsignal.c
+++ b/src/core/hook/wee-hook-hsignal.c
@@ -43,7 +43,7 @@
char *
hook_hsignal_get_description (struct t_hook *hook)
{
- return string_build_with_split_string (
+ return string_rebuild_split_string (
(const char **)(HOOK_HSIGNAL(hook, signals)), ";");
}
diff --git a/src/core/hook/wee-hook-line.c b/src/core/hook/wee-hook-line.c
index d1ef37d63..fa787eba1 100644
--- a/src/core/hook/wee-hook-line.c
+++ b/src/core/hook/wee-hook-line.c
@@ -166,7 +166,7 @@ hook_line_exec (struct t_gui_line *line)
HASHTABLE_SET_TIME("date_printed", line->data->date_printed);
HASHTABLE_SET_STR_NOT_NULL("str_time", line->data->str_time);
HASHTABLE_SET_INT("tags_count", line->data->tags_count);
- str_tags = string_build_with_split_string (
+ str_tags = string_rebuild_split_string (
(const char **)line->data->tags_array, ",");
HASHTABLE_SET_STR_NOT_NULL("tags", str_tags);
if (str_tags)
diff --git a/src/core/hook/wee-hook-signal.c b/src/core/hook/wee-hook-signal.c
index 158fcbd47..9cd72efcb 100644
--- a/src/core/hook/wee-hook-signal.c
+++ b/src/core/hook/wee-hook-signal.c
@@ -43,7 +43,7 @@
char *
hook_signal_get_description (struct t_hook *hook)
{
- return string_build_with_split_string (
+ return string_rebuild_split_string (
(const char **)(HOOK_SIGNAL(hook, signals)), ";");
}
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index d0cdef86b..a34ef109d 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -5582,7 +5582,7 @@ COMMAND_CALLBACK(repeat)
repeat_args[0] = strdup (buffer->full_name);
repeat_args[1] = strdup (argv_eol[arg_count + 1]);
repeat_args[2] = (input_commands_allowed) ?
- string_build_with_split_string (
+ string_rebuild_split_string (
(const char **)input_commands_allowed, ",") : NULL;
hook_timer (NULL, interval, 0, count - 1,
&command_repeat_timer_cb, repeat_args, NULL);
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index d59db6756..68a1d457a 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -3387,7 +3387,7 @@ config_file_add_option_to_infolist (struct t_infolist *infolist,
{
goto error;
}
- string_values = string_build_with_split_string (
+ string_values = string_rebuild_split_string (
(const char **)option->string_values, "|");
if (!infolist_new_var_string (ptr_item, "string_values", string_values))
{
diff --git a/src/core/wee-dir.c b/src/core/wee-dir.c
index 247e943be..e0a0a7361 100644
--- a/src/core/wee-dir.c
+++ b/src/core/wee-dir.c
@@ -1036,5 +1036,5 @@ dir_get_string_home_dirs ()
dirs[3] = weechat_runtime_dir;
dirs[4] = NULL;
- return string_build_with_split_string ((const char **)dirs, ":");
+ return string_rebuild_split_string ((const char **)dirs, ":");
}
diff --git a/src/core/wee-input.c b/src/core/wee-input.c
index 9247458c1..3635ffce4 100644
--- a/src/core/wee-input.c
+++ b/src/core/wee-input.c
@@ -427,7 +427,7 @@ input_data_delayed (struct t_gui_buffer *buffer, const char *data,
}
else if (input_commands_allowed)
{
- new_commands_allowed = string_build_with_split_string (
+ new_commands_allowed = string_rebuild_split_string (
(const char **)input_commands_allowed, ",");
}
else
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index f514f55f0..7d27ab367 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -2445,14 +2445,14 @@ string_free_split_shared (char **split_string)
}
/*
- * Builds a string with a split string.
+ * Rebuilds a split string using a delimiter.
*
* Note: result must be free after use.
*/
char *
-string_build_with_split_string (const char **split_string,
- const char *separator)
+string_rebuild_split_string (const char **split_string,
+ const char *separator)
{
int i, length, length_separator;
char *result;
diff --git a/src/core/wee-string.h b/src/core/wee-string.h
index 678a30350..450829db1 100644
--- a/src/core/wee-string.h
+++ b/src/core/wee-string.h
@@ -96,8 +96,8 @@ extern char **string_split_shared (const char *string, const char *separators,
extern char **string_split_shell (const char *string, int *num_items);
extern void string_free_split (char **split_string);
extern void string_free_split_shared (char **split_string);
-extern char *string_build_with_split_string (const char **split_string,
- const char *separator);
+extern char *string_rebuild_split_string (const char **split_string,
+ const char *separator);
extern char **string_split_command (const char *command, char separator);
extern void string_free_split_command (char **split_command);
extern char ***string_split_tags (const char *tags, int *num_tags);