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

Return an error when trying to set boolean option with invalid value

Browse Source
This commit is contained in:
Sebastien Helleu
2010-11-19 14:56:25 +01:00
parent aec97d2082
commit 5b236c5658
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-config-file.c
+16 -19
View File
@@ -1064,36 +1064,33 @@ config_file_option_set (struct t_config_option *option, const char *value,
switch (option->type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (!option->value)
if (config_file_string_boolean_is_valid (value))
{
option->value = malloc (sizeof (int));
if (option->value)
if (!option->value)
{
if (string_strcasecmp (value, "toggle") == 0)
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_TRUE;
else
option->value = malloc (sizeof (int));
if (option->value)
{
if (config_file_string_boolean_is_valid (value))
if (string_strcasecmp (value, "toggle") == 0)
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_TRUE;
else
{
value_int = config_file_string_to_boolean (value);
CONFIG_BOOLEAN(option) = value_int;
}
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
else
{
if (string_strcasecmp (value, "toggle") == 0)
{
CONFIG_BOOLEAN(option) =
(CONFIG_BOOLEAN(option) == CONFIG_BOOLEAN_TRUE) ?
CONFIG_BOOLEAN_FALSE : CONFIG_BOOLEAN_TRUE;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
else
{
if (config_file_string_boolean_is_valid (value))
if (string_strcasecmp (value, "toggle") == 0)
{
CONFIG_BOOLEAN(option) =
(CONFIG_BOOLEAN(option) == CONFIG_BOOLEAN_TRUE) ?
CONFIG_BOOLEAN_FALSE : CONFIG_BOOLEAN_TRUE;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
else
{
value_int = config_file_string_to_boolean (value);
if (value_int == CONFIG_BOOLEAN(option))