pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-30 14:56:39 +02:00
Code Activity

scripts: fix type of argument "rc" in callback of hook_process (from string to integer)

Browse Source
This commit is contained in:
Sebastien Helleu
2012-05-01 09:17:13 +02:00
parent f4a07da0a2
commit d282d9fd06
8 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/scripts/guile/weechat-guile-api.c
+3 -5
View File
@@ -2361,25 +2361,23 @@ weechat_guile_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = &return_code;
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_guile_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
src/plugins/scripts/lua/weechat-lua-api.c
+3 -5
View File
@@ -2605,25 +2605,23 @@ weechat_lua_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = &return_code;
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_lua_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
src/plugins/scripts/perl/weechat-perl-api.c
+3 -5
View File
@@ -2447,25 +2447,23 @@ weechat_perl_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = &return_code;
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_perl_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
src/plugins/scripts/python/weechat-python-api.c
+7 -5
View File
@@ -2547,25 +2547,23 @@ weechat_python_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = PyLong_FromLong((long)return_code);
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_python_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssOss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2574,6 +2572,10 @@ weechat_python_api_hook_process_cb (void *data,
ret = *rc;
free (rc);
}
if (func_argv[2])
{
Py_XDECREF((PyObject *)func_argv[2]);
}
return ret;
}
src/plugins/scripts/ruby/weechat-ruby-api.c
+3 -5
View File
@@ -2920,25 +2920,23 @@ weechat_ruby_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = &return_code;
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_ruby_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
src/plugins/scripts/tcl/weechat-tcl-api.c
+3 -5
View File
@@ -2869,25 +2869,23 @@ weechat_tcl_api_hook_process_cb (void *data,
{
struct t_script_callback *script_callback;
void *func_argv[5];
char str_rc[32], empty_arg[1] = { '\0' };
char empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
func_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
func_argv[1] = (command) ? (char *)command : empty_arg;
func_argv[2] = str_rc;
func_argv[2] = &return_code;
func_argv[3] = (out) ? (char *)out : empty_arg;
func_argv[4] = (err) ? (char *)err : empty_arg;
rc = (int *) weechat_tcl_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"sssss", func_argv);
"ssiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
src/plugins/scripts/tcl/weechat-tcl.c
+1 -1
View File
@@ -208,7 +208,7 @@ weechat_tcl_exec (struct t_plugin_script *script,
break;
case 'i': /* integer */
Tcl_ListObjAppendElement (interp, cmdlist,
Tcl_NewStringObj (argv[i], -1));
Tcl_NewIntObj (*((int *)argv[i])));
break;
case 'h': /* hash */
Tcl_ListObjAppendElement (interp, cmdlist,