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

api: add integer return code for functions hook_{signal|hsignal}_send

Browse Source
This commit is contained in:
Sebastien Helleu
2014-02-10 17:42:53 +01:00
parent a0bf3938f1
commit 437767c0ca
50 changed files with 543 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/lua/weechat-lua-api.c
+16 -15
View File
@@ -2643,13 +2643,13 @@ static int
weechat_lua_api_hook_signal_send (lua_State *L)
{
const char *signal, *type_data, *signal_data;
int number;
int number, rc;
API_FUNC(1, "hook_signal_send", API_RETURN_ERROR);
API_FUNC(1, "hook_signal_send", API_RETURN_INT(WEECHAT_RC_ERROR));
signal_data = NULL;
if (lua_gettop (L) < 3)
API_WRONG_ARGS(API_RETURN_ERROR);
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_RC_ERROR));
signal = lua_tostring (L, -3);
type_data = lua_tostring (L, -2);
@@ -2657,24 +2657,24 @@ weechat_lua_api_hook_signal_send (lua_State *L)
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
{
signal_data = lua_tostring (L, -1);
weechat_hook_signal_send (signal, type_data, (void *)signal_data);
API_RETURN_OK;
rc = weechat_hook_signal_send (signal, type_data, (void *)signal_data);
API_RETURN_INT(rc);
}
else if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_INT) == 0)
{
number = lua_tonumber (L, -1);
weechat_hook_signal_send (signal, type_data, &number);
API_RETURN_OK;
rc = weechat_hook_signal_send (signal, type_data, &number);
API_RETURN_INT(rc);
}
else if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_POINTER) == 0)
{
signal_data = lua_tostring (L, -1);
weechat_hook_signal_send (signal, type_data,
API_STR2PTR(signal_data));
API_RETURN_OK;
rc = weechat_hook_signal_send (signal, type_data,
API_STR2PTR(signal_data));
API_RETURN_INT(rc);
}
API_RETURN_ERROR;
API_RETURN_INT(WEECHAT_RC_ERROR);
}
int
@@ -2742,10 +2742,11 @@ weechat_lua_api_hook_hsignal_send (lua_State *L)
{
const char *signal;
struct t_hashtable *hashtable;
int rc;
API_FUNC(1, "hook_hsignal_send", API_RETURN_ERROR);
API_FUNC(1, "hook_hsignal_send", API_RETURN_INT(WEECHAT_RC_ERROR));
if (lua_gettop (L) < 2)
API_WRONG_ARGS(API_RETURN_ERROR);
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_RC_ERROR));
signal = lua_tostring (L, -2);
hashtable = weechat_lua_tohashtable (L, -1,
@@ -2753,12 +2754,12 @@ weechat_lua_api_hook_hsignal_send (lua_State *L)
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING);
weechat_hook_hsignal_send (signal, hashtable);
rc = weechat_hook_hsignal_send (signal, hashtable);
if (hashtable)
weechat_hashtable_free (hashtable);
API_RETURN_OK;
API_RETURN_INT(rc);
}
int
src/plugins/lua/weechat-lua.c
+5 -4
View File
@@ -455,8 +455,9 @@ weechat_lua_load (const char *filename)
&weechat_lua_api_buffer_input_data_cb,
&weechat_lua_api_buffer_close_cb);
weechat_hook_signal_send ("lua_script_loaded", WEECHAT_HOOK_SIGNAL_STRING,
lua_current_script->filename);
(void) weechat_hook_signal_send ("lua_script_loaded",
WEECHAT_HOOK_SIGNAL_STRING,
lua_current_script->filename);
return 1;
}
@@ -514,8 +515,8 @@ weechat_lua_unload (struct t_plugin_script *script)
if (interpreter)
lua_close (interpreter);
weechat_hook_signal_send ("lua_script_unloaded",
WEECHAT_HOOK_SIGNAL_STRING, filename);
(void) weechat_hook_signal_send ("lua_script_unloaded",
WEECHAT_HOOK_SIGNAL_STRING, filename);
if (filename)
free (filename);
}