renames in signal.h

5 files changed, 69 insertions, 69 deletions

diff --git a/AUTHORS b/AUTHORS
index b0ac737..a052746 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Andreas Baumann, abaumann at yahoo dot com
+Andreas Baumann <abaumann@yahoo.com>
diff --git a/include/wolf/daemon/signals.h b/include/wolf/daemon/signals.h
index 4d41825..70d2228 100644
--- a/include/wolf/daemon/signals.h
+++ b/include/wolf/daemon/signals.h
@@ -28,33 +28,33 @@
 extern "C" {
 #endif
 
-const char *signal_get_short_name( int sig );
+const char *wolf_signal_get_short_name( int sig );
 
-const char *signal_get_long_name( int sig );
+const char *wolf_signal_get_long_name( int sig );
 
-wolf_error_t signal_install_ignore( int sig, ... );
+wolf_error_t wolf_signal_install_ignore( int sig, ... );
 
-wolf_error_t signal_install_empty( int sig, ... );
+wolf_error_t wolf_signal_install_empty( int sig, ... );
 
-typedef void (*signal_func_t)( int );
+typedef void (*wolf_signal_func_t)( int );
 
-wolf_error_t signal_install_func( signal_func_t func, int sig, ... );
+wolf_error_t wolf_signal_install_func( wolf_signal_func_t func, int sig, ... );
 
-wolf_error_t signal_install_fatal( int sig, ... );
+wolf_error_t wolf_signal_install_fatal( int sig, ... );
 
-wolf_error_t signal_install_notify( int sig, ... );
+wolf_error_t wolf_signal_install_notify( int sig, ... );
 
-wolf_error_t signal_install_notify_parent( int sig, ... );
+wolf_error_t wolf_signal_install_notify_parent( int sig, ... );
 
-wolf_error_t signal_initialize( void );
+wolf_error_t wolf_signal_initialize( void );
 
-int signal_suspend( int timeout, wolf_error_t *error );
+int wolf_signal_suspend( int timeout, wolf_error_t *error );
 
-void signal_terminate( void );
+void wolf_signal_terminate( void );
 
-wolf_error_t signal_install_handlers_parent( void );
+wolf_error_t wolf_signal_install_handlers_parent( void );
 
-wolf_error_t signal_install_handlers_daemon( void );
+wolf_error_t wolf_signal_install_handlers_daemon( void );
 
 #ifdef __cplusplus
 }
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 7cc51cd..561d160 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -211,14 +211,14 @@ wolf_error_t wolf_daemon_start( wolf_daemon_p d ) {
 	 */
 #if defined( SIGCHLD ) && defined( SIGCLD )
 #if SIGCLD != SIGCHLD
-	signal_install_empty( SIGCLD, 0 );
-	signal_install_empty( SIGCHLD, 0 );
+	wolf_signal_install_empty( SIGCLD, 0 );
+	wolf_signal_install_empty( SIGCHLD, 0 );
 #else
 #if defined( SIGCHLD )
-	signal_install_empty( SIGCHLD, 0 );
+	wolf_signal_install_empty( SIGCHLD, 0 );
 #endif
 #if defined( SIGCLD )
-	signal_install_empty( SIGCLD, 0 );
+	wolf_signal_install_empty( SIGCLD, 0 );
 #endif
 #endif
 #endif
@@ -283,14 +283,14 @@ wolf_error_t wolf_daemon_start( wolf_daemon_p d ) {
 	 */
 #if defined( SIGCHLD ) && defined( SIGCLD )
 #if SIGCLD != SIGCHLD
-	signal_install_empty( SIGCLD, 0 );
-	signal_install_empty( SIGCHLD, 0 );
+	wolf_signal_install_empty( SIGCLD, 0 );
+	wolf_signal_install_empty( SIGCHLD, 0 );
 #else
 #if defined( SIGCHLD )
-	signal_install_empty( SIGCHLD, 0 );
+	wolf_signal_install_empty( SIGCHLD, 0 );
 #endif
 #if defined( SIGCLD )
-	signal_install_empty( SIGCLD, 0 );
+	wolf_signal_install_empty( SIGCLD, 0 );
 #endif
 #endif
 #endif
@@ -310,15 +310,15 @@ wolf_error_t wolf_daemon_start( wolf_daemon_p d ) {
 			break;
 			
 		default:
-			(void)signal_install_handlers_parent( );
+			(void)wolf_signal_install_handlers_parent( );
 			LOG( log_DEBUG, "Parent after second fork: child (and daemon) is %d", pid );
 			return ( d->state = TERMINATE_PARENT );
 	}
 
 	/* Now install signal handlers */
-	if( ( error = signal_initialize( ) ) != WOLF_OK )
+	if( ( error = wolf_signal_initialize( ) ) != WOLF_OK )
 		return ( d->error = error );
-	if( ( error = signal_install_handlers_daemon( ) ) != WOLF_OK )
+	if( ( error = wolf_signal_install_handlers_daemon( ) ) != WOLF_OK )
 		return ( d->error = error );
 		
 	/* Put the daemon in it's own process group and finally detach it
@@ -481,7 +481,7 @@ NORETURN void wolf_daemon_exit( wolf_daemon_p d ) {
 			LOG( log_DEBUG, "Terminating grand-parent of daemon with code %d (PID: %lu)",
 				exit_code, getpid( ) );
 
-			signal_terminate( );
+			wolf_signal_terminate( );
 
 			/* Do not close file descriptors of the child!
 			 * We are the father or grand-father process
@@ -504,7 +504,7 @@ NORETURN void wolf_daemon_exit( wolf_daemon_p d ) {
 			d->pidfile.fd = pid_file_fd;
 			(void)pidfile_remove( &d->pidfile );
 
-			signal_terminate( );
+			wolf_signal_terminate( );
 
 			LOG( log_DEBUG, "Terminating parent of daemon pid file fd %d (PID %lu)",
 				pid_file_fd, getpid( ) );
@@ -521,7 +521,7 @@ NORETURN void wolf_daemon_exit( wolf_daemon_p d ) {
 			 */
 			atomar_write( daemon_parent_pipe[1], &d->pidfile.fd, sizeof( int ) );
 
-			signal_terminate( );
+			wolf_signal_terminate( );
 
 			LOG( log_DEBUG, "Terminating daemon (PID: %lu)", getpid( ) );
 
@@ -545,7 +545,7 @@ NORETURN void wolf_daemon_exit( wolf_daemon_p d ) {
 			/* also terminate the parent of the daemon */
 			atomar_write( daemon_parent_pipe[1], &d->pidfile.fd, sizeof( int ) );
 
-			signal_terminate( );
+			wolf_signal_terminate( );
 
 			LOG( log_DEBUG, "Terminating daemon (PID: %lu)", getpid( ) );
 
diff --git a/src/daemon/signals.c b/src/daemon/signals.c
index ccec882..3e4036a 100644
--- a/src/daemon/signals.c
+++ b/src/daemon/signals.c
@@ -12,7 +12,7 @@
 
 #include "port/unused.h"
 
-const char *signal_get_short_name( int sig ) {
+const char *wolf_signal_get_short_name( int sig ) {
 	switch( sig ) {
 		case SIGHUP:		return "SIGHUP";
 		case SIGINT:		return "SIGINT";
@@ -81,7 +81,7 @@ const char *signal_get_short_name( int sig ) {
 	}
 }
 
-const char *signal_get_long_name( int sig ) {
+const char *wolf_signal_get_long_name( int sig ) {
 	/* we don't trust strsignal, needs _GNU_SOURCE,
 	 * naming comes from bits/signum.h on Linux 2.6
 	 */
@@ -161,16 +161,16 @@ install_ignore_again:
 	if( sigaction( sig, &sa, NULL ) < 0 ) {
 		(void)strerror_r( errno, errbuf, 1024 );
 		LOG( log_CRIT, "Can't ignore signal handler for signal '%s' (%s, %d): %s (errno: %d)",
-			signal_get_long_name( sig ),
-			signal_get_short_name( sig ),
+			wolf_signal_get_long_name( sig ),
+			wolf_signal_get_short_name( sig ),
 			sig,
 			errbuf,
 			errno );
 		return WOLF_ERR_PROGRAMMING;
 	}
 	LOG( log_DEBUG, "Ignoring signal handler for signal '%s' (%s)",
-		signal_get_long_name( sig ),
-		signal_get_short_name( sig ) );
+		wolf_signal_get_long_name( sig ),
+		wolf_signal_get_short_name( sig ) );
 	sig = va_arg( ap, int );
 	if( sig > 0 ) goto install_ignore_again;
 	
@@ -196,16 +196,16 @@ install_empty_again:
 	if( sigaction( sig, &sa, NULL ) < 0 ) {
 		(void)strerror_r( errno, errbuf, 1024 );
 		LOG( log_CRIT, "Can't install empty signal handler for signal '%s' (%s, %d): %s (errno: %d)",
-			signal_get_long_name( sig ),
-			signal_get_short_name( sig ),
+			wolf_signal_get_long_name( sig ),
+			wolf_signal_get_short_name( sig ),
 			sig,
 			errbuf,
 			errno );
 		return WOLF_ERR_PROGRAMMING;
 	}
 	LOG( log_DEBUG, "Installed empty signal handler for signal '%s' (%s)",
-		signal_get_long_name( sig ),
-		signal_get_short_name( sig ) );
+		wolf_signal_get_long_name( sig ),
+		wolf_signal_get_short_name( sig ) );
 	sig = va_arg( ap, int );
 	if( sig > 0 ) goto install_empty_again;
 	
@@ -222,8 +222,8 @@ static void fatal_handler( int sig ) {
 	
 	/* log what happened */
 	LOG( log_ALERT, "Got signal '%s' (%s)",
-		signal_get_long_name( sig ),
-		signal_get_short_name( sig ) );
+		wolf_signal_get_long_name( sig ),
+		wolf_signal_get_short_name( sig ) );
 	
 	/* we are in one thread when we got the signal, now inform
 	 * all other threads too (see Apache mpm_common.c for this
@@ -232,7 +232,7 @@ static void fatal_handler( int sig ) {
 	kill( getpid( ), sig );
 }
 
-static wolf_error_t vsignal_install_func( signal_func_t func, int sig, va_list ap ) {
+static wolf_error_t vsignal_install_func( wolf_signal_func_t func, int sig, va_list ap ) {
 	struct sigaction sa;
 	char errbuf[1024];
 
@@ -244,23 +244,23 @@ install_func_again:
 	if( sigaction( sig, &sa, NULL ) < 0 ) {
 		(void)strerror_r( errno, errbuf, 1024 );
 		LOG( log_CRIT, "Can't install signal handler for signal '%s' (%s, %d): %s (errno: %d)",
-			signal_get_long_name( sig ),
-			signal_get_short_name( sig ),
+			wolf_signal_get_long_name( sig ),
+			wolf_signal_get_short_name( sig ),
 			sig,
 			errbuf,
 			errno );
 		return WOLF_ERR_PROGRAMMING;
 	}
 	LOG( log_DEBUG, "Installed signal handler for signal '%s' (%s)",
-		signal_get_long_name( sig ),
-		signal_get_short_name( sig ) );
+		wolf_signal_get_long_name( sig ),
+		wolf_signal_get_short_name( sig ) );
 	sig = va_arg( ap, int );
 	if( sig > 0 ) goto install_func_again;
 
 	return WOLF_OK;
 }
 
-wolf_error_t signal_install_func( signal_func_t func, int sig, ... ) {
+wolf_error_t wolf_signal_install_func( wolf_signal_func_t func, int sig, ... ) {
 	va_list ap;
 	wolf_error_t error;
 	va_start( ap, sig );
@@ -270,7 +270,7 @@ wolf_error_t signal_install_func( signal_func_t func, int sig, ... ) {
 }
 
 #define INSTALL_SIGNAL( MODE ) \
-wolf_error_t signal_install_##MODE( int sig, ... ) { \
+wolf_error_t wolf_signal_install_##MODE( int sig, ... ) { \
 	va_list ap; \
 	wolf_error_t error; \
 	va_start( ap, sig ); \
@@ -283,7 +283,7 @@ INSTALL_SIGNAL( ignore )
 INSTALL_SIGNAL( empty )
 
 #define INSTALL_SIGNAL_FUNC( MODE, FUNC ) \
-wolf_error_t signal_install_##MODE( int sig, ... ) { \
+wolf_error_t wolf_signal_install_##MODE( int sig, ... ) { \
 	va_list ap; \
 	wolf_error_t error; \
 	va_start( ap, sig ); \
@@ -309,7 +309,7 @@ static void notify_handler( int sig ) {
 INSTALL_SIGNAL_FUNC( notify, notify_handler )
 INSTALL_SIGNAL_FUNC( notify_parent, notify_parent_handler )
 
-wolf_error_t signal_initialize( void ) {
+wolf_error_t wolf_signal_initialize( void ) {
 	int res;
 	char errbuf[1024];
 
@@ -330,12 +330,12 @@ wolf_error_t signal_initialize( void ) {
 	return WOLF_OK;
 }
 
-void signal_terminate( void ) {
+void wolf_signal_terminate( void ) {
 	(void)close( daemon_signal_pipe[0] );
 	(void)close( daemon_signal_pipe[1] );
 }
 
-int signal_suspend( int timeout, wolf_error_t *error ) {
+int wolf_signal_suspend( int timeout, wolf_error_t *error ) {
 	struct timeval tv;
 	fd_set fds;
 	ssize_t res;
@@ -396,11 +396,11 @@ signal_select_again:
 	return sig;
 }
 
-wolf_error_t signal_install_handlers_parent( void ) {
+wolf_error_t wolf_signal_install_handlers_parent( void ) {
 	wolf_error_t error;
 
 	/* signals to ignore */
-	if( ( error = signal_install_ignore(
+	if( ( error = wolf_signal_install_ignore(
 		SIGPIPE,
 		SIGTSTP,
 		SIGTTIN,
@@ -432,7 +432,7 @@ wolf_error_t signal_install_handlers_parent( void ) {
 		0 ) ) != WOLF_OK ) return error;
 	
 	/* signals for empty handlers */
-	if( ( error = signal_install_empty(
+	if( ( error = wolf_signal_install_empty(
 #if defined( SIGCHLD ) && defined( SIGCLD )
 #if SIGCLD != SIGCHLD
 		SIGCHLD,
@@ -450,7 +450,7 @@ wolf_error_t signal_install_handlers_parent( void ) {
 	/* fatal signal handlers, make sure the parent can read the
 	 * signal and clean up
 	 */
-	if( ( error = signal_install_notify_parent(
+	if( ( error = wolf_signal_install_notify_parent(
 		SIGILL,
 		SIGABRT,
 #if defined( SIGIOT )
@@ -475,11 +475,11 @@ wolf_error_t signal_install_handlers_parent( void ) {
 }
 
 
-wolf_error_t signal_install_handlers_daemon( void ) {
+wolf_error_t wolf_signal_install_handlers_daemon( void ) {
 	wolf_error_t error;
 
 	/* signals to ignore */
-	if( ( error = signal_install_ignore(
+	if( ( error = wolf_signal_install_ignore(
 		SIGPIPE,
 		SIGTSTP,
 		SIGTTIN,
@@ -506,7 +506,7 @@ wolf_error_t signal_install_handlers_daemon( void ) {
 		0 ) ) != WOLF_OK ) return error;
 	
 	/* signals for empty handlers */
-	if( ( error = signal_install_empty(
+	if( ( error = wolf_signal_install_empty(
 #if defined( SIGCHLD ) && defined( SIGCLD )
 #if SIGCLD != SIGCHLD
 		SIGCHLD,
@@ -524,7 +524,7 @@ wolf_error_t signal_install_handlers_daemon( void ) {
 	/* fatal signal handlers, log the exception and continue with
 	 * default behaviour of the system
 	 */
-	if( ( error = signal_install_fatal(
+	if( ( error = wolf_signal_install_fatal(
 		SIGILL,
 		SIGABRT,
 #if defined( SIGIOT )
@@ -546,7 +546,7 @@ wolf_error_t signal_install_handlers_daemon( void ) {
 		0 ) ) != WOLF_OK ) return error;
 
 	/* notify the following signals to the main loop */
-	if( ( error = signal_install_notify(
+	if( ( error = wolf_signal_install_notify(
 		SIGTERM,
 		SIGINT,
 		SIGHUP,
diff --git a/tests/daemon/testd.c b/tests/daemon/testd.c
index 5ac7fea..2f0eafa 100644
--- a/tests/daemon/testd.c
+++ b/tests/daemon/testd.c
@@ -96,12 +96,12 @@ int main( int argc, char *argv[] ) {
 			wolf_daemon_exit( demon );
 		}
 	} else {
-		if( ( error = signal_initialize( ) ) != WOLF_OK ) {
+		if( ( error = wolf_signal_initialize( ) ) != WOLF_OK ) {
 			cmdline_parser_free( &args_info );
 			exit( EXIT_FAILURE );
 		}
-		if( ( error = signal_install_handlers_daemon( ) ) != WOLF_OK ) {
-			signal_terminate( );
+		if( ( error = wolf_signal_install_handlers_daemon( ) ) != WOLF_OK ) {
+			wolf_signal_terminate( );
 			cmdline_parser_free( &args_info );
 			exit( EXIT_FAILURE );
 		}
@@ -109,7 +109,7 @@ int main( int argc, char *argv[] ) {
 
 	LOG( log_NOTICE, "Started %s daemon", CMDLINE_PARSER_PACKAGE );
 	while( ( sig != SIGTERM ) && ( sig != SIGINT ) && ( sig != -1 ) ) {
-		sig = signal_suspend( 60, &error );
+		sig = wolf_signal_suspend( 60, &error );
 		switch( sig ) {
 			case 0: /* timeout */
 				break;
@@ -136,8 +136,8 @@ int main( int argc, char *argv[] ) {
 			
 			default:
 				LOG( log_ERR, "Unexpected signal '%s' (%s, %d)",
-					signal_get_long_name( sig ),
-					signal_get_short_name( sig ),
+					wolf_signal_get_long_name( sig ),
+					wolf_signal_get_short_name( sig ),
 					sig );
 		}
 	}
@@ -148,7 +148,7 @@ int main( int argc, char *argv[] ) {
 		wolf_daemon_exit( demon );
 	} else {
 		cmdline_parser_free( &args_info );
-		signal_terminate( );
+		wolf_signal_terminate( );
 		exit( EXIT_SUCCESS );
 	}