X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fsharedmemory.c;h=9018f5cbd7d35bfd93cc39d956ec87c6151add75;hb=0f96d841842a2f4adaaf9b271dc3f3e24fa5b009;hp=b4bfee58604de774280b083dfcdf32c5259c0470;hpb=60b0fbf1b141566fd5f559c1d7db2317676a3be4;p=umurmur.git diff --git a/src/sharedmemory.c b/src/sharedmemory.c index b4bfee5..9018f5c 100644 --- a/src/sharedmemory.c +++ b/src/sharedmemory.c @@ -19,20 +19,20 @@ void Sharedmemory_init( int bindport, int bindport6 ) if(shm_fd == -1) { Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } if( ftruncate( shm_fd, shmtotal_size ) == -1 ) { Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } - shmptr = mmap(0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); - if (shmptr == (void *) -1) + shmptr = mmap( 0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0 ); + if (shmptr == MAP_FAILED) { Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } memset( shmptr, 0, shmtotal_size ); @@ -64,7 +64,7 @@ void Sharedmemory_update(void) channel_t *channel = client_itr->channel; strncpy( shmptr->client[cc].username, client_itr->username, 120 ); - strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), 45 ); + strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), INET6_ADDRSTRLEN - 1 ); strncpy( shmptr->client[cc].channel, channel->name, 120 ); strncpy( shmptr->client[cc].os, client_itr->os, 120 );