From 8c345273ffa84f1078c0e837eb9fe8f29fc5a119 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 28 Mar 2017 20:04:02 +0200 Subject: [PATCH] Indenting. --- include/xrmoptions.h | 2 +- source/rofi.c | 3 +-- source/xrmoptions.c | 49 ++++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/xrmoptions.h b/include/xrmoptions.h index 4d54f1e4..99bec516 100644 --- a/include/xrmoptions.h +++ b/include/xrmoptions.h @@ -142,6 +142,6 @@ char ** config_parser_return_display_help ( unsigned int *length ); * * @param p Property to set */ -void config_parse_set_property ( const Property *p); +void config_parse_set_property ( const Property *p ); /* @}*/ #endif diff --git a/source/rofi.c b/source/rofi.c index 37feead9..f67b337f 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -1051,7 +1051,7 @@ int main ( int argc, char *argv[] ) config_parse_xresource_options ( xcb ); config_parse_xresource_options_file ( config_path ); - find_arg_str ( "-theme", &(config.theme)); + find_arg_str ( "-theme", &( config.theme ) ); if ( config.theme ) { TICK_N ( "Parse theme" ); if ( rofi_theme_parse_file ( config.theme ) ) { @@ -1072,7 +1072,6 @@ int main ( int argc, char *argv[] ) TICK_N ( "Setup Modi" ); } - const char ** theme_str = find_arg_strv ( "-theme-str" ); if ( theme_str ) { for ( int index = 0; theme_str && theme_str[index]; index++ ) { diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 189c0ee2..04126acd 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -387,10 +387,9 @@ void config_parse_cmd_options ( void ) static void __config_parser_set_property ( XrmOption *option, const Property *p ) { - if ( option->type == xrm_String ) - { + if ( option->type == xrm_String ) { if ( p->type != P_STRING ) { - fprintf(stderr, "Option: %s needs to be set with a string.\n", option->name); + fprintf ( stderr, "Option: %s needs to be set with a string.\n", option->name ); return; } if ( ( option )->mem != NULL ) { @@ -401,46 +400,48 @@ static void __config_parser_set_property ( XrmOption *option, const Property *p // Memory ( option )->mem = *( option->value.str ); - option->source = CONFIG_FILE_THEME; - } else if ( option->type == xrm_Number ) { - if ( p->type != P_INTEGER ){ - fprintf(stderr, "Option: %s needs to be set with a number.\n", option->name); + option->source = CONFIG_FILE_THEME; + } + else if ( option->type == xrm_Number ) { + if ( p->type != P_INTEGER ) { + fprintf ( stderr, "Option: %s needs to be set with a number.\n", option->name ); return; } - *(option->value.snum) = p->value.i; - option->source = CONFIG_FILE_THEME; - } else if ( option->type == xrm_SNumber ) { - if ( p->type != P_INTEGER ){ - fprintf(stderr, "Option: %s needs to be set with a number.\n", option->name); + *( option->value.snum ) = p->value.i; + option->source = CONFIG_FILE_THEME; + } + else if ( option->type == xrm_SNumber ) { + if ( p->type != P_INTEGER ) { + fprintf ( stderr, "Option: %s needs to be set with a number.\n", option->name ); return; } - *(option->value.num) = (unsigned int )(p->value.i); - option->source = CONFIG_FILE_THEME; - } else if ( option->type == xrm_Boolean ) { - if ( p->type != P_BOOLEAN ){ - fprintf(stderr, "Option: %s needs to be set with a boolean.\n", option->name); + *( option->value.num ) = (unsigned int ) ( p->value.i ); + option->source = CONFIG_FILE_THEME; + } + else if ( option->type == xrm_Boolean ) { + if ( p->type != P_BOOLEAN ) { + fprintf ( stderr, "Option: %s needs to be set with a boolean.\n", option->name ); return; } - *(option->value.num) = (p->value.b); - option->source = CONFIG_FILE_THEME; + *( option->value.num ) = ( p->value.b ); + option->source = CONFIG_FILE_THEME; } } - void config_parse_set_property ( const Property *p ) { for ( unsigned int i = 0; i < sizeof ( xrmOptions ) / sizeof ( XrmOption ); ++i ) { XrmOption *op = &( xrmOptions[i] ); - if ( g_strcmp0 ( op->name, p->name) == 0 ) { + if ( g_strcmp0 ( op->name, p->name ) == 0 ) { __config_parser_set_property ( op, p ); - return; + return; } } for ( unsigned int i = 0; i < num_extra_options; ++i ) { XrmOption *op = &( extra_options[i] ); - if ( g_strcmp0 ( op->name, p->name) == 0 ) { + if ( g_strcmp0 ( op->name, p->name ) == 0 ) { __config_parser_set_property ( op, p ); - return; + return; } } }