At Scott McKellar's suggestion, using (long) cast and %ld format for getpid()

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7368 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/apachemods/mod_rest_gateway.c b/Open-ILS/src/apachemods/mod_rest_gateway.c
index b8a48c7..2c93229 100644 (file)
--- a/Open-ILS/src/apachemods/mod_rest_gateway.c
+++ b/Open-ILS/src/apachemods/mod_rest_gateway.c
@@ -36,7 +36,7 @@ static void mod_ils_gateway_child_init(apr_pool_t *p, server_rec *s) {
                osrfLogError( OSRF_LOG_MARK, "Unable to load gateway config file...");
                return;
        }
-       fprintf(stderr, "Bootstrapping %d\n", getpid() );
+       fprintf(stderr, "Bootstrapping %ld\n", (long) getpid() );
        fflush(stderr);
 }
 
@@ -138,8 +138,8 @@ static int mod_ils_gateway_method_handler (request_rec *r) {
 
        }
 
-       osrfLogInfo( OSRF_LOG_MARK, "Performing(%d):  service %s | method %s | \n",
-                       getpid(), service, method );
+       osrfLogInfo( OSRF_LOG_MARK, "Performing(%ld):  service %s | method %s | \n",
+                       (long) getpid(), service, method );
 
        int k;
        for( k = 0; k!= sarray->size; k++ ) {

diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c
index 1b44919..fb73e2f 100644 (file)
--- a/Open-ILS/src/c-apps/oils_auth.c
+++ b/Open-ILS/src/c-apps/oils_auth.c
@@ -101,7 +101,7 @@ int oilsAuthInit( osrfMethodContext* ctx ) {
 
                } else {
 
-                       seed = va_list_to_string( "%d.%d.%s", time(NULL), getpid(), username );
+                       seed = va_list_to_string( "%d.%ld.%s", time(NULL), (long) getpid(), username );
                        key = va_list_to_string( "%s%s", OILS_AUTH_CACHE_PRFX, username );
        
                        md5seed = md5sum(seed);
@@ -282,7 +282,7 @@ oilsEvent* oilsAuthHandleLoginOK(
        osrfLogDebug(OSRF_LOG_MARK, "Auth session timeout for %s: %f", uname, timeout );
 
        char* string = va_list_to_string( 
-                       "%d.%d.%s", getpid(), time(NULL), uname ); 
+                       "%d.%ld.%s", (long) getpid(), time(NULL), uname ); 
        char* authToken = md5sum(string); 
        char* authKey = va_list_to_string( 
                        "%s%s", OILS_AUTH_CACHE_PRFX, authToken ); 

diff --git a/OpenSRF/src/jserver/osrf_chat.c b/OpenSRF/src/jserver/osrf_chat.c
index 55b3c33..235a7e4 100644 (file)
--- a/OpenSRF/src/jserver/osrf_chat.c
+++ b/OpenSRF/src/jserver/osrf_chat.c
@@ -587,7 +587,7 @@ int osrfChatHandleNewConnection( osrfChatNode* node, const char* name, const xml
 char* osrfChatMkAuthKey() {
        char keybuf[112];
        bzero(keybuf, 112);
-       snprintf(keybuf, 111, "%d%d%s", (int) time(NULL), getpid(), getenv("HOSTNAME"));
+       snprintf(keybuf, 111, "%d%ld%s", (int) time(NULL), (long) getpid(), getenv("HOSTNAME"));
        return strdup(shahash(keybuf));
 }
 

diff --git a/OpenSRF/src/libstack/osrf_app_session.c b/OpenSRF/src/libstack/osrf_app_session.c
index 054ea30..095e50e 100644 (file)
--- a/OpenSRF/src/libstack/osrf_app_session.c
+++ b/OpenSRF/src/libstack/osrf_app_session.c
@@ -229,7 +229,7 @@ osrf_app_session* osrf_app_client_session_init( char* remote_service ) {
        char id[256];
        memset(id,0,256);
 
-       sprintf(id, "%f.%d%d", get_timestamp_millis(), (int)time(NULL), getpid());
+       sprintf(id, "%f.%d%ld", get_timestamp_millis(), (int)time(NULL), (long) getpid());
        session->session_id = strdup(id);
        osrfLogDebug( OSRF_LOG_MARK,  "Building a new client session with id [%s] [%s]", 
                        session->remote_service, session->session_id );

diff --git a/OpenSRF/src/libstack/osrf_prefork.c b/OpenSRF/src/libstack/osrf_prefork.c
index 0a3e54f..1ea5959 100644 (file)
--- a/OpenSRF/src/libstack/osrf_prefork.c
+++ b/OpenSRF/src/libstack/osrf_prefork.c
@@ -606,8 +606,8 @@ void prefork_child_wait( prefork_child* child ) {
 
        buffer_free(gbuf);
 
-       osrfLogDebug( OSRF_LOG_MARK, "Child with max-requests=%d, num-served=%d exiting...[%d]", 
-                       child->max_requests, i, getpid() );
+       osrfLogDebug( OSRF_LOG_MARK, "Child with max-requests=%d, num-served=%d exiting...[%ld]", 
+                       child->max_requests, i, (long) getpid() );
 
    osrf_prefork_child_exit(child); /* just to be sure */
 }

diff --git a/OpenSRF/src/libtransport/basic_client.c b/OpenSRF/src/libtransport/basic_client.c
index d2178eb..d7fa9a1 100644 (file)
--- a/OpenSRF/src/libtransport/basic_client.c
+++ b/OpenSRF/src/libtransport/basic_client.c
@@ -29,7 +29,7 @@ int main( int argc, char** argv ) {
        if( (pid=fork()) ) { /* parent */
 
                signal(SIGINT, sig_int);
-               fprintf(stderr, "Listener: %d\n", getpid() );   
+               fprintf(stderr, "Listener: %ld\n", (long) getpid() );   
                char buf[300];
                memset(buf, 0, 300);
                printf("=> ");
@@ -56,7 +56,7 @@ int main( int argc, char** argv ) {
 
        } else {
 
-               fprintf(stderr, "Sender: %d\n", getpid() );     
+               fprintf(stderr, "Sender: %ld\n", (long) getpid() );     
 
                transport_message* recv;
                while( (recv=client_recv( client, -1)) ) {

diff --git a/OpenSRF/src/utils/log.c b/OpenSRF/src/utils/log.c
index 70d1a1f..cac10b0 100644 (file)
--- a/OpenSRF/src/utils/log.c
+++ b/OpenSRF/src/utils/log.c
@@ -61,7 +61,7 @@ void osrfLogSetIsClient(int is) {
    /* go ahead and create the xid prefix so it will be consistent later */
    static char buff[32];
    memset(buff, 0x0, 32);
-   snprintf(buff, 32, "%d%d", (int)time(NULL), getpid());
+   snprintf(buff, 32, "%ld%d", (int)time(NULL), (long) getpid());
    __osrfLogXidPfx = buff;
 }
 
@@ -177,11 +177,11 @@ void _osrfLogDetail( int level, const char* filename, int line, char* msg ) {
                buf[1533] = '.';
                buf[1534] = '.';
                buf[1535] = '\0';
-               syslog( fac | lvl, "[%s:%d:%s:%d:%s] %s", l, getpid(), filename, line, xid, buf );
+               syslog( fac | lvl, "[%s:%ld:%s:%d:%s] %s", l, (long) getpid(), filename, line, xid, buf );
        }
 
        else if( __osrfLogType == OSRF_LOG_TYPE_FILE )
-               _osrfLogToFile("[%s:%d:%s:%d:%s] %s", l, getpid(), filename, line, xid, msg );
+               _osrfLogToFile("[%s:%ld:%s:%d:%s] %s", l, (long) getpid(), filename, line, xid, msg );
 
 }
 

diff --git a/OpenSRF/src/utils/socket_bundle.c b/OpenSRF/src/utils/socket_bundle.c
index 5441adf..b966d44 100644 (file)
--- a/OpenSRF/src/utils/socket_bundle.c
+++ b/OpenSRF/src/utils/socket_bundle.c
@@ -639,7 +639,7 @@ int _socket_handle_client_data(socket_manager* mgr, socket_node* node) {
        memset(buf, 0, RBUFSIZE);
        set_fl(sock_fd, O_NONBLOCK);
 
-       osrfLogInternal( OSRF_LOG_MARK, "%d : Received data at %f\n", getpid(), get_timestamp_millis());
+       osrfLogInternal( OSRF_LOG_MARK, "%ld : Received data at %f\n", (long) getpid(), get_timestamp_millis());
 
        while( (read_bytes = recv(sock_fd, buf, RBUFSIZE-1, 0) ) > 0 ) {
                osrfLogInternal( OSRF_LOG_MARK, "Socket %d Read %d bytes and data: %s", sock_fd, read_bytes, buf);