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

api: return allocated string in hook_info callback and function info_get

Browse Source
This commit is contained in:
Sébastien Helleu
2019-04-12 21:29:39 +02:00
parent c80dc2a5ca
commit 3d95217745
54 changed files with 724 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/javascript/weechat-js-api.cpp
+7 -11
View File
@@ -95,8 +95,6 @@ extern "C"
plugin_script_str2ptr (weechat_js_plugin, \
JS_CURRENT_SCRIPT_NAME, \
js_function_name.c_str(), __string)
#define API_STATIC_STRING(__string) \
plugin_script_get_static_string(&js_data, __string);
#define API_RETURN_OK return v8::True();
#define API_RETURN_ERROR return v8::False();
#define API_RETURN_EMPTY \
@@ -2847,14 +2845,14 @@ API_FUNC(hook_modifier_exec)
API_RETURN_STRING_FREE(result);
}
const char *
char *
weechat_js_api_hook_info_cb (const void *pointer, void *data,
const char *info_name,
const char *arguments)
{
struct t_plugin_script *script;
void *func_argv[3];
char empty_arg[1] = { '\0' }, *result;
char empty_arg[1] = { '\0' };
const char *ptr_function, *ptr_data;
script = (struct t_plugin_script *)pointer;
@@ -2866,12 +2864,10 @@ weechat_js_api_hook_info_cb (const void *pointer, void *data,
func_argv[1] = (info_name) ? (char *)info_name : empty_arg;
func_argv[2] = (arguments) ? (char *)arguments : empty_arg;
result = (char *)weechat_js_exec (script,
WEECHAT_SCRIPT_EXEC_STRING,
ptr_function,
"sss", func_argv);
return API_STATIC_STRING(result);
return (char *)weechat_js_exec (script,
WEECHAT_SCRIPT_EXEC_STRING,
ptr_function,
"sss", func_argv);
}
return NULL;
@@ -4014,7 +4010,7 @@ API_FUNC(info_get)
result = weechat_info_get (*info_name, *arguments);
API_RETURN_STRING(result);
API_RETURN_STRING_FREE(result);
}
API_FUNC(info_get_hashtable)
src/plugins/javascript/weechat-js.cpp
+3 -6
View File
@@ -56,7 +56,6 @@ int js_eval_mode = 0;
int js_eval_send_input = 0;
int js_eval_exec_commands = 0;
struct t_gui_buffer *js_eval_buffer = NULL;
char *js_eval_output = NULL;
struct t_plugin_script *js_scripts = NULL;
struct t_plugin_script *last_js_script = NULL;
@@ -756,12 +755,12 @@ weechat_js_hdata_cb (const void *pointer, void *data,
* Returns javascript info "javascript_eval".
*/
const char *
char *
weechat_js_info_eval_cb (const void *pointer, void *data,
const char *info_name,
const char *arguments)
{
static const char *not_implemented = "not yet implemented";
const char *not_implemented = "not yet implemented";
/* make C compiler happy */
(void) pointer;
@@ -769,7 +768,7 @@ weechat_js_info_eval_cb (const void *pointer, void *data,
(void) info_name;
(void) arguments;
return not_implemented;
return strdup (not_implemented);
}
/*
@@ -977,8 +976,6 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
if (js_action_autoload_list)
free (js_action_autoload_list);
/* weechat_string_dyn_free (js_buffer_output, 1); */
if (js_eval_output)
free (js_eval_output);
return WEECHAT_RC_OK;
}