Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
script: make callbacks optional again in hook functions (issue #406)
  • Loading branch information
flashcode committed Apr 28, 2016
1 parent b0aa0d3 commit eff655a
Showing 1 changed file with 5 additions and 50 deletions.
55 changes: 5 additions & 50 deletions src/plugins/plugin-script-api.c
Expand Up @@ -71,8 +71,11 @@ plugin_script_api_config_new (struct t_weechat_plugin *weechat_plugin,
script,
function_and_data);

if (!new_config_file && function_and_data)
free (function_and_data);
if (!new_config_file)
{
if (function_and_data)
free (function_and_data);
}

return new_config_file;
}
Expand Down Expand Up @@ -376,9 +379,6 @@ plugin_script_api_hook_command (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_command (command, description, args,
Expand Down Expand Up @@ -418,9 +418,6 @@ plugin_script_api_hook_command_run (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_command_run (command,
Expand Down Expand Up @@ -458,9 +455,6 @@ plugin_script_api_hook_timer (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_timer (interval, align_second, max_calls,
Expand Down Expand Up @@ -499,9 +493,6 @@ plugin_script_api_hook_fd (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_fd (fd, flag_read, flag_write, flag_exception,
Expand Down Expand Up @@ -544,9 +535,6 @@ plugin_script_api_hook_process_hashtable (struct t_weechat_plugin *weechat_plugi
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_process_hashtable (command, options, timeout,
Expand Down Expand Up @@ -619,9 +607,6 @@ plugin_script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_connect (proxy, address, port, ipv6, retry,
Expand Down Expand Up @@ -669,9 +654,6 @@ plugin_script_api_hook_print (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_print (buffer, tags, message, strip_colors,
Expand Down Expand Up @@ -711,9 +693,6 @@ plugin_script_api_hook_signal (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_signal (signal, callback, script,
Expand Down Expand Up @@ -752,9 +731,6 @@ plugin_script_api_hook_hsignal (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_hsignal (signal, callback, script,
Expand Down Expand Up @@ -793,9 +769,6 @@ plugin_script_api_hook_config (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_config (option, callback, script,
Expand Down Expand Up @@ -836,9 +809,6 @@ plugin_script_api_hook_completion (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_completion (completion, description,
Expand Down Expand Up @@ -878,9 +848,6 @@ plugin_script_api_hook_modifier (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_modifier (modifier,
Expand Down Expand Up @@ -921,9 +888,6 @@ plugin_script_api_hook_info (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_info (info_name, description, args_description,
Expand Down Expand Up @@ -965,9 +929,6 @@ plugin_script_api_hook_info_hashtable (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_info_hashtable (info_name, description,
Expand Down Expand Up @@ -1013,9 +974,6 @@ plugin_script_api_hook_infolist (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_infolist (infolist_name, description,
Expand Down Expand Up @@ -1054,9 +1012,6 @@ plugin_script_api_hook_focus (struct t_weechat_plugin *weechat_plugin,
char *function_and_data;
struct t_hook *new_hook;

if (!function || !function[0])
return NULL;

function_and_data = plugin_script_build_function_and_data (function, data);

new_hook = weechat_hook_focus (area, callback, script, function_and_data);
Expand Down

0 comments on commit eff655a

Please sign in to comment.