X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=3cb394bdc47ec1484fa73f35b987109a43e6f575;hb=5c20474fdb245df8c4a01b3aa59628b06712e89b;hp=9af2a447ea72a5b5d3f3185f271dfd10b420a654;hpb=d16ce5a735ffc00768f54b0b52afe8ab2115b057;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 9af2a447..3cb394bd 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.49 2005/01/20 00:12:23 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.54 2005/04/16 09:31:30 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -44,23 +44,32 @@ static char UNUSED id[] = "$Id: log.c,v 1.49 2005/01/20 00:12:23 alex Exp $";
 #include "log.h"
 
 
-LOCAL CHAR Error_File[FNAME_LEN];
-LOCAL CHAR Init_Txt[127];
+LOCAL char Init_Txt[127];
 
+#ifdef DEBUG
+LOCAL char Error_File[FNAME_LEN];
+#endif
 
-LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
 
+LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
 
-GLOBAL VOID
-Log_Init( VOID )
+
+GLOBAL void
+Log_Init( void )
 {
 #ifdef SYSLOG
+#ifndef LOG_CONS	/* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#define LOG_CONS 0
+#endif
+#ifndef LOG_LOCAL5
+#define LOG_LOCAL5 0
+#endif
 	/* Syslog initialisieren */
 	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
 	/* Hello World! */
-	Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
+	Log( LOG_NOTICE, "%s started.", NGIRCd_Version );
 	  
 	/* Informationen uebern den "Operation Mode" */
 	Init_Txt[0] = '\0';
@@ -89,18 +98,22 @@ Log_Init( VOID )
 #endif
 	if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
 
+#ifdef DEBUG
 	Error_File[0] = '\0';
+#endif
 } /* Log_Init */
 
 
-GLOBAL VOID
-Log_InitErrorfile( VOID )
+#ifdef DEBUG
+
+GLOBAL void
+Log_InitErrorfile( void )
 {
 	/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
 	 * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
 	/* Dateiname zusammen bauen */
-	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
+	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
 
 	/* stderr umlenken */
 	fflush( stderr );
@@ -112,26 +125,30 @@ Log_InitErrorfile( VOID )
 
 	/* Einige Infos in das Error-File schreiben */
 	fputs( ctime( &NGIRCd_Start ), stderr );
-	fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
+	fprintf( stderr, "%s started.\n", NGIRCd_Version );
 	fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
 	fflush( stderr );
 
 	Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
 } /* Log_InitErrfile */
 
+#endif
+
 
-GLOBAL VOID
-Log_Exit( VOID )
+GLOBAL void
+Log_Exit( void )
 {
 	/* Good Bye! */
 	if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
 	else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
 
+#ifdef DEBUG
 	if( Error_File[0] )
 	{
 		/* Error-File (stderr) loeschen */
 		if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
 	}
+#endif
 
 #ifdef SYSLOG
 	/* syslog abmelden */
@@ -141,20 +158,20 @@ Log_Exit( VOID )
 
 
 #ifdef PROTOTYPES
-GLOBAL VOID
-Log( INT Level, CONST CHAR *Format, ... )
+GLOBAL void
+Log( int Level, const char *Format, ... )
 #else
-GLOBAL VOID
+GLOBAL void
 Log( Level, Format, va_alist )
-INT Level;
-CONST CHAR *Format;
+int Level;
+const char *Format;
 va_dcl
 #endif
 {
 	/* Eintrag in Logfile(s) schreiben */
 
-	CHAR msg[MAX_LOG_MSG_LEN];
-	BOOLEAN snotice;
+	char msg[MAX_LOG_MSG_LEN];
+	bool snotice;
 	va_list ap;
 
 	assert( Format != NULL );
@@ -162,10 +179,10 @@ va_dcl
 	if( Level & LOG_snotice )
 	{
 		/* Notice an User mit "s" Mode */
-		snotice = TRUE;
+		snotice = true;
 		Level &= ~LOG_snotice;
 	}
-	else snotice = FALSE;
+	else snotice = false;
 
 #ifdef DEBUG
 	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
@@ -185,7 +202,7 @@ va_dcl
 	if( NGIRCd_NoDaemon )
 	{
 		/* auf Konsole ausgeben */
-		fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+		fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
 		fflush( stdout );
 	}
 #ifdef SYSLOG
@@ -198,7 +215,7 @@ va_dcl
 
 	if( Level <= LOG_CRIT )
 	{
-		/* Kritische Meldungen in Error-File (stderr) */
+		/* log critical messages to stderr */
 		fprintf( stderr, "%s\n", msg );
 		fflush( stderr );
 	}
@@ -211,8 +228,8 @@ va_dcl
 } /* Log */
 
 
-GLOBAL VOID
-Log_Init_Resolver( VOID )
+GLOBAL void
+Log_Init_Resolver( void )
 {
 #ifdef SYSLOG
 	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
@@ -221,8 +238,8 @@ Log_Init_Resolver( VOID )
 } /* Log_Init_Resolver */
 
 
-GLOBAL VOID
-Log_Exit_Resolver( VOID )
+GLOBAL void
+Log_Exit_Resolver( void )
 {
 	Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
 #ifdef SYSLOG
@@ -232,19 +249,19 @@ Log_Exit_Resolver( VOID )
 
 
 #ifdef PROTOTYPES
-GLOBAL VOID
-Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+GLOBAL void
+Log_Resolver( const int Level, const char *Format, ... )
 #else
-GLOBAL VOID
+GLOBAL void
 Log_Resolver( Level, Format, va_alist )
-CONST INT Level;
-CONST CHAR *Format;
+const int Level;
+const char *Format;
 va_dcl
 #endif
 {
 	/* Eintrag des Resolver in Logfile(s) schreiben */
 
-	CHAR msg[MAX_LOG_MSG_LEN];
+	char msg[MAX_LOG_MSG_LEN];
 	va_list ap;
 
 	assert( Format != NULL );
@@ -268,17 +285,17 @@ va_dcl
 	if( NGIRCd_NoDaemon )
 	{
 		/* Output to console */
-		fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+		fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
 		fflush( stdout );
 	}
 #ifdef SYSLOG
-	else syslog( Level, msg );
+	else syslog( Level, "%s", msg );
 #endif
 } /* Log_Resolver */
 
 
-LOCAL VOID
-Wall_ServerNotice( CHAR *Msg )
+LOCAL void
+Wall_ServerNotice( char *Msg )
 {
 	/* Server-Notice an entsprechende User verschicken */