mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-06-19 23:04:09 +00:00
Code Issues Releases Wiki Activity

use %ld as format specifier for posix data types

Browse Source 
in the same vein as the earlier commit:
cast posix data types (pid_t, ...) to long and use
%ld as format specifier. This will avoid problems
when sizeof(int) != sizeof(type).

We could also cast to int, but this might truncate the value.
This commit is contained in:
Florian Westphal 2008-12-17 23:27:25 +01:00
parent 4b83a23d9d
commit d26a283ea9
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/ngircd/log.c
View File

@ -14,8 +14,6 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: log.c,v 1.62 2006/08/05 09:16:21 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
@ -54,6 +52,22 @@ static char Error_File[FNAME_LEN];
static void Wall_ServerNotice PARAMS(( char *Msg )); static void Wall_ServerNotice PARAMS(( char *Msg ));
static void
Log_Message(int Level, const char *msg)
{
if (!Is_Daemon) {
/* log to console */
fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level,
(long)time(NULL) - NGIRCd_Start, msg);
fflush(stdout);
}
#ifdef SYSLOG
else {
syslog(Level, "%s", msg);
}
#endif
}
GLOBAL void GLOBAL void
Log_Init( bool Daemon_Mode ) Log_Init( bool Daemon_Mode )
@ -248,25 +262,12 @@ va_dcl
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap ); va_end( ap );
if (!Is_Daemon) { Log_Message(Level, msg);
/* log to console */
fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level,
time(NULL) - NGIRCd_Start, msg);
fflush(stdout);
}
#ifdef SYSLOG
else
{
/* Syslog */
syslog( Level, "%s", msg );
}
#endif
if( Level <= LOG_CRIT ) if (Level <= LOG_CRIT) {
{
/* log critical messages to stderr */ /* log critical messages to stderr */
fprintf( stderr, "%s\n", msg ); fprintf(stderr, "%s\n", msg);
fflush( stderr ); fflush(stderr);
} }
if (snotice) { if (snotice) {
@ -285,7 +286,7 @@ Log_Init_Resolver( void )
openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif #endif
#ifdef DEBUG #ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( )); Log_Resolver(LOG_DEBUG, "Resolver sub-process starting, PID %ld.", (long)getpid());
#endif #endif
} /* Log_Init_Resolver */ } /* Log_Init_Resolver */
@ -294,7 +295,7 @@ GLOBAL void
Log_Exit_Resolver( void ) Log_Exit_Resolver( void )
{ {
#ifdef DEBUG #ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( )); Log_Resolver(LOG_DEBUG, "Resolver sub-process %ld done.", (long)getpid());
#endif #endif
#ifdef SYSLOG #ifdef SYSLOG
closelog( ); closelog( );
@ -335,15 +336,7 @@ va_dcl
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap ); va_end( ap );
if (!Is_Daemon) { Log_Message(Level, msg);
/* Output to console */
fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level,
time(NULL) - NGIRCd_Start, msg);
fflush(stdout);
}
#ifdef SYSLOG
else syslog( Level, "%s", msg );
#endif
} /* Log_Resolver */ } /* Log_Resolver */