diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-02-11 11:23:04 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-02-11 11:23:04 +0100 |
| commit | 7c97099bb70cbd1d41724ae0ba7c68fe83e12663 (patch) | |
| tree | 75a24b4a9712daf757b78a778d77e4b7f3b94e86 /tests/daemon | |
| parent | 81b111036ebbc6bf4977a9b5d68b652504acbc17 (diff) | |
| download | wolfbones-7c97099bb70cbd1d41724ae0ba7c68fe83e12663.tar.gz wolfbones-7c97099bb70cbd1d41724ae0ba7c68fe83e12663.tar.bz2 | |
renamed log_ constants to WOLF_LOG_ to avoid name clashes
Diffstat (limited to 'tests/daemon')
| -rw-r--r-- | tests/daemon/testd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/daemon/testd.c b/tests/daemon/testd.c index b0251b6..858a554 100644 --- a/tests/daemon/testd.c +++ b/tests/daemon/testd.c @@ -24,7 +24,7 @@ static int parse_options_and_arguments( int argc, char *argv[], struct gengetopt } static int test_config( const char *filename ) { - WOLF_LOG( log_NOTICE, "Testing configuraton read from '%s'", filename ); + WOLF_LOG( WOLF_LOG_NOTICE, "Testing configuraton read from '%s'", filename ); return EXIT_SUCCESS; } @@ -63,18 +63,18 @@ int main( int argc, char *argv[] ) { args_info.config_file_arg : DEFAULT_CONFIG_FILE ) ); } - wolf_log_openlogtostderr( log_DEBUG - 1 + (int)args_info.debug_given ); + wolf_log_openlogtostderr( WOLF_LOG_DEBUG - 1 + (int)args_info.debug_given ); if( args_info.logfile_given ) wolf_log_openlogtofile( args_info.logfile_arg, args_info.logfile_level_given ? - wolf_log_str_to_level( args_info.logfile_level_arg ) : log_NOTICE ); + wolf_log_str_to_level( args_info.logfile_level_arg ) : WOLF_LOG_NOTICE ); if( !args_info.foreground_given ) { wolf_log_openlogtosyslog( CMDLINE_PARSER_PACKAGE, args_info.syslog_facility_given ? - wolf_log_str_to_syslog_facility( args_info.syslog_facility_arg ) : log_DAEMON, + wolf_log_str_to_syslog_facility( args_info.syslog_facility_arg ) : WOLF_LOG_DAEMON, args_info.syslog_level_given ? - wolf_log_str_to_level( args_info.syslog_level_arg ) : log_NOTICE ); + wolf_log_str_to_level( args_info.syslog_level_arg ) : WOLF_LOG_NOTICE ); memset( &daemon_params, 0, sizeof( daemon_params ) ); daemon_params.daemon_name = CMDLINE_PARSER_PACKAGE; @@ -107,7 +107,7 @@ int main( int argc, char *argv[] ) { } } - WOLF_LOG( log_NOTICE, "Started %s daemon", CMDLINE_PARSER_PACKAGE ); + WOLF_LOG( WOLF_LOG_NOTICE, "Started %s daemon", CMDLINE_PARSER_PACKAGE ); while( ( sig != SIGTERM ) && ( sig != SIGINT ) && ( sig != -1 ) ) { sig = wolf_signal_suspend( 60, &error ); switch( sig ) { @@ -115,17 +115,17 @@ int main( int argc, char *argv[] ) { break; case -1: /* internal error */ - WOLF_LOG( log_CRIT, "Suspending on UNIX signal resulted in an error %d!", + WOLF_LOG( WOLF_LOG_CRIT, "Suspending on UNIX signal resulted in an error %d!", error ); break; case SIGHUP: - WOLF_LOG( log_NOTICE, "Rereading configuration" ); + WOLF_LOG( WOLF_LOG_NOTICE, "Rereading configuration" ); break; case SIGTERM: case SIGINT: - WOLF_LOG( log_NOTICE, "Got termination signal, shutting down the daemon" ); + WOLF_LOG( WOLF_LOG_NOTICE, "Got termination signal, shutting down the daemon" ); break; case SIGUSR1: @@ -135,13 +135,13 @@ int main( int argc, char *argv[] ) { break; default: - WOLF_LOG( log_ERR, "Unexpected signal '%s' (%s, %d)", + WOLF_LOG( WOLF_LOG_ERR, "Unexpected signal '%s' (%s, %d)", wolf_signal_get_long_name( sig ), wolf_signal_get_short_name( sig ), sig ); } } - WOLF_LOG( log_NOTICE, "Stopped %s daemon", CMDLINE_PARSER_PACKAGE ); + WOLF_LOG( WOLF_LOG_NOTICE, "Stopped %s daemon", CMDLINE_PARSER_PACKAGE ); if( !args_info.foreground_given ) { cmdline_parser_free( &args_info ); |