From e68a9a82152afdd652983cd3958ba96f28af58e3 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 29 May 2007 13:08:53 +0000 Subject: [PATCH] dueling patches of pedantism git-svn-id: svn://svn.open-ils.org/ILS/trunk@7381 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/libstack/osrf_system.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenSRF/src/libstack/osrf_system.c b/OpenSRF/src/libstack/osrf_system.c index 2cda339f2a..23c44ad6ac 100644 --- a/OpenSRF/src/libstack/osrf_system.c +++ b/OpenSRF/src/libstack/osrf_system.c @@ -105,11 +105,11 @@ int osrfSystemBootstrap( char* hostname, char* configfile, char* contextNode ) { osrfLogInfo( OSRF_LOG_MARK, "Launching application %s with implementation %s", appname, libfile); - int pid; + pid_t pid; if( (pid = fork()) ) { // storage pid in local table for re-launching dead children... - osrfLogInfo( OSRF_LOG_MARK, "Launched application child %d", pid); + osrfLogInfo( OSRF_LOG_MARK, "Launched application child %ld", (long) pid); } else { @@ -135,10 +135,12 @@ int osrfSystemBootstrap( char* hostname, char* configfile, char* contextNode ) { if(errno == ECHILD) osrfLogError(OSRF_LOG_MARK, "We have no more live services... exiting"); else - osrfLogError(OSRF_LOG_MARK, "Exiting top-level system loop with error: %s", strerror(errno)); + char* err_str = strerror(errno); + osrfLogError(OSRF_LOG_MARK, "Exiting top-level system loop with error: %s", err_str); + free(err_str); break; } else { - osrfLogError(OSRF_LOG_MARK, "We lost a top-level service process with PID %d", pid); + osrfLogError(OSRF_LOG_MARK, "We lost a top-level service process with PID %ld", pid); } } -- 2.11.0