From 0a8017b780891a9214a658effe62a9016a92086e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 19 May 2017 12:24:19 -0400 Subject: [PATCH] whitespace/google code style --- src/zm_config.cpp | 118 +++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 80 deletions(-) diff --git a/src/zm_config.cpp b/src/zm_config.cpp index 6f4e59b6e..61c61bf5a 100644 --- a/src/zm_config.cpp +++ b/src/zm_config.cpp @@ -27,16 +27,13 @@ #include "zm_utils.h" -void zmLoadConfig() -{ +void zmLoadConfig() { FILE *cfg; char line[512]; - if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL ) - { + if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL ) { Fatal( "Can't open %s: %s", ZM_CONFIG, strerror(errno) ); } - while ( fgets( line, sizeof(line), cfg ) != NULL ) - { + while ( fgets( line, sizeof(line), cfg ) != NULL ) { char *line_ptr = line; // Trim off any cr/lf line endings @@ -53,16 +50,14 @@ void zmLoadConfig() // Remove trailing white space char *temp_ptr = line_ptr+strlen(line_ptr)-1; - while ( *temp_ptr == ' ' || *temp_ptr == '\t' ) - { + while ( *temp_ptr == ' ' || *temp_ptr == '\t' ) { *temp_ptr-- = '\0'; temp_ptr--; } // Now look for the '=' in the middle of the line temp_ptr = strchr( line_ptr, '=' ); - if ( !temp_ptr ) - { + if ( !temp_ptr ) { Warning( "Invalid data in %s: '%s'", ZM_CONFIG, line ); continue; } @@ -72,12 +67,10 @@ void zmLoadConfig() char *val_ptr = temp_ptr+1; // Trim trailing space from the name part - do - { + do { *temp_ptr = '\0'; temp_ptr--; - } - while ( *temp_ptr == ' ' || *temp_ptr == '\t' ); + } while ( *temp_ptr == ' ' || *temp_ptr == '\t' ); // Remove leading white space from the value part white_len = strspn( val_ptr, " \t" ); @@ -99,8 +92,7 @@ void zmLoadConfig() staticConfig.SERVER_NAME = std::string(val_ptr); else if ( strcasecmp( name_ptr, "ZM_SERVER_ID" ) == 0 ) staticConfig.SERVER_ID = atoi(val_ptr); - else - { + else { // We ignore this now as there may be more parameters than the // c/c++ binaries are bothered about // Warning( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG ); @@ -143,8 +135,7 @@ void zmLoadConfig() StaticConfig staticConfig; -ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *const p_type ) -{ +ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *const p_type ) { name = new char[strlen(p_name)+1]; strcpy( name, p_name ); value = new char[strlen(p_value)+1]; @@ -157,50 +148,37 @@ ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *con accessed = false; } -ConfigItem::~ConfigItem() -{ +ConfigItem::~ConfigItem() { delete[] name; delete[] value; delete[] type; } -void ConfigItem::ConvertValue() const -{ - if ( !strcmp( type, "boolean" ) ) - { +void ConfigItem::ConvertValue() const { + if ( !strcmp( type, "boolean" ) ) { cfg_type = CFG_BOOLEAN; cfg_value.boolean_value = (bool)strtol( value, 0, 0 ); - } - else if ( !strcmp( type, "integer" ) ) - { + } else if ( !strcmp( type, "integer" ) ) { cfg_type = CFG_INTEGER; cfg_value.integer_value = strtol( value, 0, 10 ); - } - else if ( !strcmp( type, "hexadecimal" ) ) - { + } else if ( !strcmp( type, "hexadecimal" ) ) { cfg_type = CFG_INTEGER; cfg_value.integer_value = strtol( value, 0, 16 ); - } - else if ( !strcmp( type, "decimal" ) ) - { + } else if ( !strcmp( type, "decimal" ) ) { cfg_type = CFG_DECIMAL; cfg_value.decimal_value = strtod( value, 0 ); - } - else - { + } else { cfg_type = CFG_STRING; cfg_value.string_value = value; } accessed = true; } -bool ConfigItem::BooleanValue() const -{ +bool ConfigItem::BooleanValue() const { if ( !accessed ) ConvertValue(); - if ( cfg_type != CFG_BOOLEAN ) - { + if ( cfg_type != CFG_BOOLEAN ) { Error( "Attempt to fetch boolean value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type ); exit( -1 ); } @@ -208,13 +186,11 @@ bool ConfigItem::BooleanValue() const return( cfg_value.boolean_value ); } -int ConfigItem::IntegerValue() const -{ +int ConfigItem::IntegerValue() const { if ( !accessed ) ConvertValue(); - if ( cfg_type != CFG_INTEGER ) - { + if ( cfg_type != CFG_INTEGER ) { Error( "Attempt to fetch integer value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type ); exit( -1 ); } @@ -222,13 +198,11 @@ int ConfigItem::IntegerValue() const return( cfg_value.integer_value ); } -double ConfigItem::DecimalValue() const -{ +double ConfigItem::DecimalValue() const { if ( !accessed ) ConvertValue(); - if ( cfg_type != CFG_DECIMAL ) - { + if ( cfg_type != CFG_DECIMAL ) { Error( "Attempt to fetch decimal value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type ); exit( -1 ); } @@ -236,13 +210,11 @@ double ConfigItem::DecimalValue() const return( cfg_value.decimal_value ); } -const char *ConfigItem::StringValue() const -{ +const char *ConfigItem::StringValue() const { if ( !accessed ) ConvertValue(); - if ( cfg_type != CFG_STRING ) - { + if ( cfg_type != CFG_STRING ) { Error( "Attempt to fetch string value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type ); exit( -1 ); } @@ -250,80 +222,66 @@ const char *ConfigItem::StringValue() const return( cfg_value.string_value ); } -Config::Config() -{ +Config::Config() { n_items = 0; items = 0; } -Config::~Config() -{ - if ( items ) - { - for ( int i = 0; i < n_items; i++ ) - { +Config::~Config() { + if ( items ) { + for ( int i = 0; i < n_items; i++ ) { delete items[i]; } delete[] items; } } -void Config::Load() -{ +void Config::Load() { static char sql[ZM_SQL_SML_BUFSIZ]; strncpy( sql, "select Name, Value, Type from Config order by Id", sizeof(sql) ); - if ( mysql_query( &dbconn, sql ) ) - { + if ( mysql_query( &dbconn, sql ) ) { Error( "Can't run query: %s", mysql_error( &dbconn ) ); exit( mysql_errno( &dbconn ) ); } MYSQL_RES *result = mysql_store_result( &dbconn ); - if ( !result ) - { + if ( !result ) { Error( "Can't use query result: %s", mysql_error( &dbconn ) ); exit( mysql_errno( &dbconn ) ); } n_items = mysql_num_rows( result ); - if ( n_items <= ZM_MAX_CFG_ID ) - { + if ( n_items <= ZM_MAX_CFG_ID ) { Error( "Config mismatch, expected %d items, read %d. Try running 'zmupdate.pl -f' to reload config.", ZM_MAX_CFG_ID+1, n_items ); exit( -1 ); } items = new ConfigItem *[n_items]; - for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) - { + for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) { items[i] = new ConfigItem( dbrow[0], dbrow[1], dbrow[2] ); } mysql_free_result( result ); } -void Config::Assign() -{ +void Config::Assign() { ZM_CFG_ASSIGN_LIST } -const ConfigItem &Config::Item( int id ) -{ - if ( !n_items ) - { +const ConfigItem &Config::Item( int id ) { + if ( !n_items ) { Load(); Assign(); } - if ( id < 0 || id > ZM_MAX_CFG_ID ) - { + if ( id < 0 || id > ZM_MAX_CFG_ID ) { Error( "Attempt to access invalid config, id = %d. Try running 'zmupdate.pl -f' to reload config.", id ); exit( -1 ); } ConfigItem *item = items[id]; - if ( !item ) - { + if ( !item ) { Error( "Can't find config item %d", id ); exit( -1 ); }