pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 06:16:40 +02:00
Code Activity

core: fix type of variables "buffer_name" and "buffer_type" sent to the hook_line callback

Browse Source
This commit is contained in:
Sébastien Helleu
2018-08-14 14:51:18 +02:00
parent 49c3e62106
commit 3bdab1c538
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/hook/wee-hook-line.c
+3 -3
View File
@@ -131,9 +131,9 @@ hook_line_exec (struct t_gui_line *line)
if (!hashtable)
break;
}
HASHTABLE_SET_PTR("buffer", line->data->buffer);
HASHTABLE_SET_PTR("buffer_name", line->data->buffer->full_name);
HASHTABLE_SET_PTR("buffer_type",
HASHTABLE_SET_POINTER("buffer", line->data->buffer);
HASHTABLE_SET_STR("buffer_name", line->data->buffer->full_name);
HASHTABLE_SET_STR("buffer_type",
gui_buffer_type_string[line->data->buffer->type]);
HASHTABLE_SET_INT("y", line->data->y);
HASHTABLE_SET_TIME("date", line->data->date);
src/core/wee-hashtable.h
+1 -1
View File
@@ -40,7 +40,7 @@ struct t_infolist_item;
#define HASHTABLE_SET_TIME(__name, __time) \
snprintf (str_value, sizeof (str_value), "%lld", (long long)__time); \
hashtable_set (hashtable, __name, str_value);
#define HASHTABLE_SET_PTR(__name, __pointer) \
#define HASHTABLE_SET_POINTER(__name, __pointer) \
if (__pointer) \
{ \
snprintf (str_value, sizeof (str_value), \
src/gui/gui-focus.c
+5 -5
View File
@@ -161,7 +161,7 @@ gui_focus_to_hashtable (struct t_gui_focus_info *focus_info, const char *key)
HASHTABLE_SET_INT("_y", focus_info->y);
/* window */
HASHTABLE_SET_PTR("_window", focus_info->window);
HASHTABLE_SET_POINTER("_window", focus_info->window);
if (focus_info->window)
{
HASHTABLE_SET_INT("_window_number", (focus_info->window)->number);
@@ -172,7 +172,7 @@ gui_focus_to_hashtable (struct t_gui_focus_info *focus_info, const char *key)
}
/* buffer */
HASHTABLE_SET_PTR("_buffer", focus_info->buffer);
HASHTABLE_SET_POINTER("_buffer", focus_info->buffer);
if (focus_info->buffer)
{
HASHTABLE_SET_INT("_buffer_number", (focus_info->buffer)->number);
@@ -184,7 +184,7 @@ gui_focus_to_hashtable (struct t_gui_focus_info *focus_info, const char *key)
}
else
{
HASHTABLE_SET_PTR("_buffer", NULL);
HASHTABLE_SET_POINTER("_buffer", NULL);
HASHTABLE_SET_STR("_buffer_number", "-1");
HASHTABLE_SET_STR("_buffer_plugin", "");
HASHTABLE_SET_STR("_buffer_name", "");
@@ -202,7 +202,7 @@ gui_focus_to_hashtable (struct t_gui_focus_info *focus_info, const char *key)
str_tags = string_build_with_split_string ((const char **)((focus_info->chat_line)->data)->tags_array, ",");
str_message = gui_color_decode (((focus_info->chat_line)->data)->message, NULL);
nick = gui_line_get_nick_tag (focus_info->chat_line);
HASHTABLE_SET_PTR("_chat_line", focus_info->chat_line);
HASHTABLE_SET_POINTER("_chat_line", focus_info->chat_line);
HASHTABLE_SET_INT("_chat_line_x", focus_info->chat_line_x);
HASHTABLE_SET_INT("_chat_line_y", ((focus_info->chat_line)->data)->y);
HASHTABLE_SET_TIME("_chat_line_date", ((focus_info->chat_line)->data)->date);
@@ -223,7 +223,7 @@ gui_focus_to_hashtable (struct t_gui_focus_info *focus_info, const char *key)
}
else
{
HASHTABLE_SET_PTR("_chat_line", NULL);
HASHTABLE_SET_POINTER("_chat_line", NULL);
HASHTABLE_SET_STR("_chat_line_x", "-1");
HASHTABLE_SET_STR("_chat_line_y", "-1");
HASHTABLE_SET_STR("_chat_line_date", "-1");