PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-03 15:34:54 -05:00
Code Releases Activity

xrmoptions: Use a switch where possible

Browse source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-11-11 11:30:08 +01:00
parent ae4ea622bb
commit 58ed481198
No known key found for this signature in database
GPG key ID: AC203F96E2C34BB7
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/xrmoptions.c
View file

@ -226,11 +226,14 @@ void config_parser_add_option ( XrmOptionType type, const char *key, void **valu
extra_options[num_extra_options].value.pointer = value; extra_options[num_extra_options].value.pointer = value;
extra_options[num_extra_options].comment = comment; extra_options[num_extra_options].comment = comment;
extra_options[num_extra_options].source = CONFIG_DEFAULT; extra_options[num_extra_options].source = CONFIG_DEFAULT;
if ( type == xrm_String ) { switch ( type )
{
case xrm_String:
extra_options[num_extra_options].mem = ( (char *) ( *value ) ); extra_options[num_extra_options].mem = ( (char *) ( *value ) );
} break;
else { default:
extra_options[num_extra_options].mem = NULL; extra_options[num_extra_options].mem = NULL;
break;
} }
num_extra_options++; num_extra_options++;
@ -238,7 +241,9 @@ void config_parser_add_option ( XrmOptionType type, const char *key, void **valu
static void config_parser_set ( XrmOption *option, char *xrmValue, enum ConfigSource source ) static void config_parser_set ( XrmOption *option, char *xrmValue, enum ConfigSource source )
{ {
if ( option->type == xrm_String ) { switch ( option->type )
{
case xrm_String:
if ( ( option )->mem != NULL ) { if ( ( option )->mem != NULL ) {
g_free ( option->mem ); g_free ( option->mem );
option->mem = NULL; option->mem = NULL;
@ -247,14 +252,14 @@ static void config_parser_set ( XrmOption *option, char *xrmValue, enum ConfigSo
// Memory // Memory
( option )->mem = *( option->value.str ); ( option )->mem = *( option->value.str );
} break;
else if ( option->type == xrm_Number ) { case xrm_Number:
*( option->value.num ) = (unsigned int) g_ascii_strtoull ( xrmValue, NULL, 10 ); *( option->value.num ) = (unsigned int) g_ascii_strtoull ( xrmValue, NULL, 10 );
} break;
else if ( option->type == xrm_SNumber ) { case xrm_SNumber:
*( option->value.snum ) = (int) g_ascii_strtoll ( xrmValue, NULL, 10 ); *( option->value.snum ) = (int) g_ascii_strtoll ( xrmValue, NULL, 10 );
} break;
else if ( option->type == xrm_Boolean ) { case xrm_Boolean:
if ( strlen ( xrmValue ) > 0 && if ( strlen ( xrmValue ) > 0 &&
g_ascii_strcasecmp ( xrmValue, "true" ) == 0 ) { g_ascii_strcasecmp ( xrmValue, "true" ) == 0 ) {
*( option->value.num ) = TRUE; *( option->value.num ) = TRUE;
@ -262,9 +267,10 @@ static void config_parser_set ( XrmOption *option, char *xrmValue, enum ConfigSo
else{ else{
*( option->value.num ) = FALSE; *( option->value.num ) = FALSE;
} }
} break;
else if ( option->type == xrm_Char ) { case xrm_Char:
*( option->value.charc ) = helper_parse_char ( xrmValue ); *( option->value.charc ) = helper_parse_char ( xrmValue );
break;
} }
option->source = source; option->source = source;
} }