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

ruby: fix value returned in case of error in some functions

Browse Source 
Affected functions:
- config_option_reset
- config_color
- config_color_default
- config_write
- config_read
- config_reload
- buffer_string_replace_local_var
- command
This commit is contained in:
Sébastien Helleu
2015-03-01 10:13:06 +01:00
parent e6d3a78d2c
commit d1cd844e06
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.asciidoc
+3
View File
@@ -47,6 +47,9 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* python: fix name of function "bar_update" in case of error
* python: fix restore of old interpreter when a function is not found in the
script
* ruby: fix value returned in case of error in functions:
config_option_reset, config_color, config_color_default, config_write,
config_read, config_reload, buffer_string_replace_local_var, command
* scripts: fix return code of function bar_set in
python/perl/ruby/lua/tcl/guile plugins
* scripts: fix type of value returned by function hdata_time (from string to
src/plugins/ruby/weechat-ruby-api.c
+16 -16
View File
@@ -1502,9 +1502,9 @@ weechat_ruby_api_config_option_reset (VALUE class, VALUE option,
char *c_option;
int c_run_callback, rc;
API_INIT_FUNC(1, "config_option_reset", API_RETURN_INT(0));
API_INIT_FUNC(1, "config_option_reset", API_RETURN_INT(WEECHAT_CONFIG_OPTION_SET_ERROR));
if (NIL_P (option) || NIL_P (run_callback))
API_WRONG_ARGS(API_RETURN_INT(0));
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_CONFIG_OPTION_SET_ERROR));
Check_Type (option, T_STRING);
Check_Type (run_callback, T_FIXNUM);
@@ -1766,9 +1766,9 @@ weechat_ruby_api_config_color (VALUE class, VALUE option)
char *c_option;
const char *result;
API_INIT_FUNC(1, "config_color", API_RETURN_INT(0));
API_INIT_FUNC(1, "config_color", API_RETURN_EMPTY);
if (NIL_P (option))
API_WRONG_ARGS(API_RETURN_INT(0));
API_WRONG_ARGS(API_RETURN_EMPTY);
Check_Type (option, T_STRING);
@@ -1785,9 +1785,9 @@ weechat_ruby_api_config_color_default (VALUE class, VALUE option)
char *c_option;
const char *result;
API_INIT_FUNC(1, "config_color_default", API_RETURN_INT(0));
API_INIT_FUNC(1, "config_color_default", API_RETURN_EMPTY);
if (NIL_P (option))
API_WRONG_ARGS(API_RETURN_INT(0));
API_WRONG_ARGS(API_RETURN_EMPTY);
Check_Type (option, T_STRING);
@@ -1852,9 +1852,9 @@ weechat_ruby_api_config_write (VALUE class, VALUE config_file)
char *c_config_file;
int rc;
API_INIT_FUNC(1, "config_write", API_RETURN_INT(-1));
API_INIT_FUNC(1, "config_write", API_RETURN_INT(WEECHAT_CONFIG_WRITE_ERROR));
if (NIL_P (config_file))
API_WRONG_ARGS(API_RETURN_INT(-1));
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_CONFIG_WRITE_ERROR));
Check_Type (config_file, T_STRING);
@@ -1871,9 +1871,9 @@ weechat_ruby_api_config_read (VALUE class, VALUE config_file)
char *c_config_file;
int rc;
API_INIT_FUNC(1, "config_read", API_RETURN_INT(-1));
API_INIT_FUNC(1, "config_read", API_RETURN_INT(WEECHAT_CONFIG_READ_FILE_NOT_FOUND));
if (NIL_P (config_file))
API_WRONG_ARGS(API_RETURN_INT(-1));
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_CONFIG_READ_FILE_NOT_FOUND));
Check_Type (config_file, T_STRING);
@@ -1890,9 +1890,9 @@ weechat_ruby_api_config_reload (VALUE class, VALUE config_file)
char *c_config_file;
int rc;
API_INIT_FUNC(1, "config_reload", API_RETURN_INT(-1));
API_INIT_FUNC(1, "config_reload", API_RETURN_INT(WEECHAT_CONFIG_READ_FILE_NOT_FOUND));
if (NIL_P (config_file))
API_WRONG_ARGS(API_RETURN_INT(-1));
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_CONFIG_READ_FILE_NOT_FOUND));
Check_Type (config_file, T_STRING);
@@ -4041,9 +4041,9 @@ weechat_ruby_api_buffer_string_replace_local_var (VALUE class, VALUE buffer, VAL
char *c_buffer, *c_string, *result;
VALUE return_value;
API_INIT_FUNC(1, "buffer_string_replace_local_var", API_RETURN_ERROR);
API_INIT_FUNC(1, "buffer_string_replace_local_var", API_RETURN_EMPTY);
if (NIL_P (buffer) || NIL_P (string))
API_WRONG_ARGS(API_RETURN_ERROR);
API_WRONG_ARGS(API_RETURN_EMPTY);
Check_Type (buffer, T_STRING);
Check_Type (string, T_STRING);
@@ -4897,9 +4897,9 @@ weechat_ruby_api_command (VALUE class, VALUE buffer, VALUE command)
char *c_buffer, *c_command;
int rc;
API_INIT_FUNC(1, "command", API_RETURN_ERROR);
API_INIT_FUNC(1, "command", API_RETURN_INT(WEECHAT_RC_ERROR));
if (NIL_P (buffer) || NIL_P (command))
API_WRONG_ARGS(API_RETURN_ERROR);
API_WRONG_ARGS(API_RETURN_INT(WEECHAT_RC_ERROR));
Check_Type (buffer, T_STRING);
Check_Type (command, T_STRING);