debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use socklen_t where available.

Browse Source 
Patch from <Pascal.Stumpf@cubes.de>

This should use socklen_t where available, really ...
This commit is contained in:
Jon Trulson
2012-08-09 12:27:58 -06:00
parent 686bcfadc7
commit 1f332de27b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/lib/tt/bin/ttdbserverd/db_server_svc.C
View File

@@ -217,7 +217,7 @@ main(int argc, char** argv, char **envp)
#if defined(DEC) || defined(sun) || defined(HPUX) #if defined(DEC) || defined(sun) || defined(HPUX)
int asize = sizeof(struct sockaddr); int asize = sizeof(struct sockaddr);
#else #else
# if defined(linux) # if defined(linux) || defined(CSRG_BASED)
socklen_t asize; socklen_t asize;
# else # else
size_t asize = sizeof(struct sockaddr); size_t asize = sizeof(struct sockaddr);
@@ -484,7 +484,7 @@ main(int argc, char** argv, char **envp)
if (!_tt_debug_mode) { if (!_tt_debug_mode) {
if (0!=fork()) exit(0); if (0!=fork()) exit(0);
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
setpgrp(); setpgrp();

8
cde/lib/tt/lib/mp/mp_stream_socket.C
View File

@@ -172,8 +172,12 @@ init(int init_as_source)
t_strerror( t_errno ) ); t_strerror( t_errno ) );
return 0; return 0;
} }
#else
#if defined(linux) || defined(CSRG_BASED)
socklen_t len;
#else #else
int len; int len;
#endif
int optval; int optval;
_sock = socket(AF_INET, SOCK_STREAM, 0); _sock = socket(AF_INET, SOCK_STREAM, 0);
if (_sock < 0) { if (_sock < 0) {
@@ -439,7 +443,11 @@ accept()
{ {
if (_msgsock == -1) { if (_msgsock == -1) {
#ifndef OPT_TLI #ifndef OPT_TLI
#if defined(linux) || defined(CSRG_BASED)
socklen_t addrlen = sizeof(sockaddr_in);
#else
int addrlen = sizeof(sockaddr_in); int addrlen = sizeof(sockaddr_in);
#endif
sockaddr_in saddr; sockaddr_in saddr;
#if defined(_AIX) && (OSMAJORVERSION==4) && (OSMINORVERSION==2) #if defined(_AIX) && (OSMAJORVERSION==4) && (OSMINORVERSION==2)

4
cde/lib/tt/slib/mp_rpc_server.C
View File

@@ -355,7 +355,11 @@ gettransient(int proto, int vers, int *sockp)
#ifndef OPT_TLI #ifndef OPT_TLI
int found; int found;
int s; int s;
#if defined(linux) || defined(CSRG_BASED)
socklen_t len;
#else
int len; int len;
#endif
int socktype; int socktype;
sockaddr_in addr; sockaddr_in addr;
sockaddr_in tport; sockaddr_in tport;