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

Fix callbacks in script plugins: always return empty string instead of NULL for arguments

Browse Source
This commit is contained in:
Sebastien Helleu
2009-03-06 23:30:58 +01:00
parent 8e55147364
commit 700ce289ae
5 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/scripts/lua/weechat-lua-api.c
+46 -46
View File
@@ -1092,7 +1092,7 @@ weechat_lua_api_config_read_cb (void *data,
const char *option_name, const char *value)
{
struct t_script_callback *script_callback;
char *lua_argv[5];
char *lua_argv[5], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
@@ -1101,8 +1101,8 @@ weechat_lua_api_config_read_cb (void *data,
{
lua_argv[0] = script_ptr2str (config_file);
lua_argv[1] = script_ptr2str (section);
lua_argv[2] = (char *)option_name;
lua_argv[3] = (char *)value;
lua_argv[2] = (option_name) ? (char *)option_name : empty_arg;
lua_argv[3] = (value) ? (char *)value : empty_arg;
lua_argv[4] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -1138,7 +1138,7 @@ weechat_lua_api_config_section_write_cb (void *data,
const char *section_name)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc;
script_callback = (struct t_script_callback *)data;
@@ -1146,7 +1146,7 @@ weechat_lua_api_config_section_write_cb (void *data,
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = script_ptr2str (config_file);
lua_argv[1] = (char *)section_name;
lua_argv[1] = (section_name) ? (char *)section_name : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -1172,7 +1172,7 @@ weechat_lua_api_config_section_write_default_cb (void *data,
const char *section_name)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc;
script_callback = (struct t_script_callback *)data;
@@ -1180,7 +1180,7 @@ weechat_lua_api_config_section_write_default_cb (void *data,
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = script_ptr2str (config_file);
lua_argv[1] = (char *)section_name;
lua_argv[1] = (section_name) ? (char *)section_name : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -1207,7 +1207,7 @@ weechat_lua_api_config_section_create_option_cb (void *data,
const char *value)
{
struct t_script_callback *script_callback;
char *lua_argv[5];
char *lua_argv[5], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
@@ -1216,8 +1216,8 @@ weechat_lua_api_config_section_create_option_cb (void *data,
{
lua_argv[0] = script_ptr2str (config_file);
lua_argv[1] = script_ptr2str (section);
lua_argv[2] = (char *)option_name;
lua_argv[3] = (char *)value;
lua_argv[2] = (option_name) ? (char *)option_name : empty_arg;
lua_argv[3] = (value) ? (char *)value : empty_arg;
lua_argv[4] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -1412,7 +1412,7 @@ weechat_lua_api_config_option_check_value_cb (void *data,
const char *value)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
@@ -1420,7 +1420,7 @@ weechat_lua_api_config_option_check_value_cb (void *data,
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = script_ptr2str (option);
lua_argv[1] = (char *)value;
lua_argv[1] = (value) ? (char *)value : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3070,15 +3070,15 @@ weechat_lua_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
const char *command)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = script_ptr2str (buffer);
lua_argv[1] = (char *)command;
lua_argv[1] = (command) ? (char *)command : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3163,7 +3163,7 @@ weechat_lua_api_hook_timer_cb (void *data, int remaining_calls)
snprintf (str_remaining_calls, sizeof (str_remaining_calls),
"%d", remaining_calls);
lua_argv[0] = NULL;
lua_argv[0] = str_remaining_calls;
lua_argv[1] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3344,7 +3344,7 @@ weechat_lua_api_hook_process_cb (void *data,
{
snprintf (str_rc, sizeof (str_rc), "%d", return_code);
lua_argv[0] = (char *)command;
lua_argv[0] = (command) ? (char *)command : empty_arg;
lua_argv[1] = str_rc;
lua_argv[2] = (stdout) ? (char *)stdout : empty_arg;
lua_argv[3] = (stderr) ? (char *)stderr : empty_arg;
@@ -3423,7 +3423,7 @@ int
weechat_lua_api_hook_connect_cb (void *data, int status, const char *ip_address)
{
struct t_script_callback *script_callback;
char *lua_argv[3], str_status[32];
char *lua_argv[3], str_status[32], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
@@ -3433,7 +3433,7 @@ weechat_lua_api_hook_connect_cb (void *data, int status, const char *ip_address)
snprintf (str_status, sizeof (str_status), "%d", status);
lua_argv[0] = str_status;
lua_argv[1] = (char *)ip_address;
lua_argv[1] = (ip_address) ? (char *)ip_address : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3526,7 +3526,7 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
const char *prefix, const char *message)
{
struct t_script_callback *script_callback;
char *lua_argv[8];
char *lua_argv[8], empty_arg[1] = { '\0' };
static char timebuffer[64];
int *rc, ret;
@@ -3546,8 +3546,8 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
lua_argv[2] = strdup ("");
lua_argv[3] = (displayed) ? strdup ("1") : strdup ("0");
lua_argv[4] = (highlight) ? strdup ("1") : strdup ("0");
lua_argv[5] = (char *)prefix;
lua_argv[6] = (char *)message;
lua_argv[5] = (prefix) ? (char *)prefix : empty_arg;
lua_argv[6] = (message) ? (char *)message : empty_arg;
lua_argv[7] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3638,19 +3638,19 @@ weechat_lua_api_hook_signal_cb (void *data, const char *signal,
const char *type_data, void *signal_data)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
static char value_str[64], empty_value[1] = { '\0' };
char *lua_argv[3], empty_arg[1] = { '\0' };
static char value_str[64];
int *rc, ret, free_needed;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)signal;
lua_argv[0] = (signal) ? (char *)signal : empty_arg;
free_needed = 0;
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
{
lua_argv[1] = (signal_data) ? (char *)signal_data : empty_value;
lua_argv[1] = (signal_data) ? (char *)signal_data : empty_arg;
}
else if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_INT) == 0)
{
@@ -3664,7 +3664,7 @@ weechat_lua_api_hook_signal_cb (void *data, const char *signal,
free_needed = 1;
}
else
lua_argv[1] = NULL;
lua_argv[1] = empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3795,15 +3795,15 @@ weechat_lua_api_hook_config_cb (void *data, const char *option,
const char *value)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)option;
lua_argv[1] = (char *)value;
lua_argv[0] = (option) ? (char *)option : empty_arg;
lua_argv[1] = (value) ? (char *)value : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,
@@ -3879,14 +3879,14 @@ weechat_lua_api_hook_completion_cb (void *data, const char *completion_item,
struct t_gui_completion *completion)
{
struct t_script_callback *script_callback;
char *lua_argv[4];
char *lua_argv[4], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)completion_item;
lua_argv[0] = (completion_item) ? (char *)completion_item : empty_arg;
lua_argv[1] = script_ptr2str (buffer);
lua_argv[2] = script_ptr2str (completion);
lua_argv[3] = NULL;
@@ -4012,15 +4012,15 @@ weechat_lua_api_hook_modifier_cb (void *data, const char *modifier,
const char *string)
{
struct t_script_callback *script_callback;
char *lua_argv[4];
char *lua_argv[4], empty_arg[1] = { '\0' };
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)modifier;
lua_argv[1] = (char *)modifier_data;
lua_argv[2] = (char *)string;
lua_argv[0] = (modifier) ? (char *)modifier : empty_arg;
lua_argv[1] = (modifier_data) ? (char *)modifier_data : empty_arg;
lua_argv[2] = (string) ? (char *)string : empty_arg;
lua_argv[3] = NULL;
return (char *)weechat_lua_exec (script_callback->script,
@@ -4125,14 +4125,14 @@ weechat_lua_api_hook_info_cb (void *data, const char *info_name,
const char *arguments)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)info_name;
lua_argv[1] = (char *)arguments;
lua_argv[0] = (info_name) ? (char *)info_name : empty_arg;
lua_argv[1] = (arguments) ? (char *)arguments : empty_arg;
lua_argv[2] = NULL;
return (const char *)weechat_lua_exec (script_callback->script,
@@ -4198,16 +4198,16 @@ weechat_lua_api_hook_infolist_cb (void *data, const char *info_name,
void *pointer, const char *arguments)
{
struct t_script_callback *script_callback;
char *lua_argv[4];
char *lua_argv[4], empty_arg[1] = { '\0' };
struct t_infolist *result;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = (char *)info_name;
lua_argv[0] = (info_name) ? (char *)info_name : empty_arg;
lua_argv[1] = script_ptr2str (pointer);
lua_argv[2] = (char *)arguments;
lua_argv[2] = (arguments) ? (char *)arguments : empty_arg;
lua_argv[3] = NULL;
result = (struct t_infolist *)weechat_lua_exec (script_callback->script,
@@ -4337,15 +4337,15 @@ weechat_lua_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
const char *input_data)
{
struct t_script_callback *script_callback;
char *lua_argv[3];
char *lua_argv[3], empty_arg[1] = { '\0' };
int *rc, ret;
script_callback = (struct t_script_callback *)data;
if (script_callback && script_callback->function && script_callback->function[0])
{
lua_argv[0] = script_ptr2str (buffer);
lua_argv[1] = (char *)input_data;
lua_argv[1] = (input_data) ? (char *)input_data : empty_arg;
lua_argv[2] = NULL;
rc = (int *) weechat_lua_exec (script_callback->script,