diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-05-21 14:15:24 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-05-21 14:15:24 +0000 |
commit | ab222c170562ba2f89827c2e3185ae359eface76 (patch) | |
tree | 3dfcdf8a5b7a267b153c72533a894d4aaa47fe8e /apps/settings.c | |
parent | a968ddbb39e246e6eec744fff4b7650dfa8e2791 (diff) | |
download | rockbox-ab222c170562ba2f89827c2e3185ae359eface76.tar.gz rockbox-ab222c170562ba2f89827c2e3185ae359eface76.zip |
Simplify some redundant boolean expressions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21013 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index a782ac5548..0457f879c6 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -315,9 +315,9 @@ bool settings_load_config(const char* file, bool apply) | |||
315 | { | 315 | { |
316 | int temp; | 316 | int temp; |
317 | if (cfg_string_to_int(i,&temp,value)) | 317 | if (cfg_string_to_int(i,&temp,value)) |
318 | *(bool*)settings[i].setting = (temp==0?false:true); | 318 | *(bool*)settings[i].setting = (temp!=0); |
319 | if (settings[i].bool_setting->option_callback) | 319 | if (settings[i].bool_setting->option_callback) |
320 | settings[i].bool_setting->option_callback(temp==0?false:true); | 320 | settings[i].bool_setting->option_callback(temp!=0); |
321 | break; | 321 | break; |
322 | } | 322 | } |
323 | case F_T_CHARPTR: | 323 | case F_T_CHARPTR: |
@@ -1132,7 +1132,7 @@ bool set_option(const char* string, const void* variable, enum optiontype type, | |||
1132 | if (!option_screen(&item, NULL, false, NULL)) | 1132 | if (!option_screen(&item, NULL, false, NULL)) |
1133 | { | 1133 | { |
1134 | if (type == BOOL) | 1134 | if (type == BOOL) |
1135 | *(bool*)variable = (temp == 1? true: false); | 1135 | *(bool*)variable = (temp == 1); |
1136 | else | 1136 | else |
1137 | *(int*)variable = temp; | 1137 | *(int*)variable = temp; |
1138 | return false; | 1138 | return false; |