minor type cleanliness patches for inn-CURRENT-20010222
Dan Riley
dsr at mail.lns.cornell.edu
Sat Feb 24 21:53:30 UTC 2001
Mostly socklen_t stuff.
Index: frontends/ovdb_server.c
===================================================================
RCS file: /nfs/localsrc/cvsroot/news/inn/frontends/ovdb_server.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ovdb_server.c
--- frontends/ovdb_server.c 2001/02/22 20:05:38 1.1.1.1
+++ frontends/ovdb_server.c 2001/02/24 21:48:21
@@ -537,7 +537,8 @@
serverproc(int me)
{
fd_set rdset, wrset;
- int i, ret, count, lastfd, salen, lastnumreaders;
+ int i, ret, count, lastfd, lastnumreaders;
+ socklen_t salen;
struct sockaddr_in sa;
struct timeval tv;
char string[50];
@@ -615,7 +616,7 @@
if(FD_ISSET(listensock, &rdset)) {
if(!ovdb_conf.maxrsconn || numreaders < ovdb_conf.maxrsconn) {
salen = sizeof(sa);
- ret = accept(listensock, &sa, &salen);
+ ret = accept(listensock, (struct sockaddr *)&sa, &salen);
if(ret >= 0) {
newclient(ret);
wholistens = -1;
@@ -714,7 +715,8 @@
int
main(int argc, char *argv[])
{
- int i, salen, ret;
+ int i, ret;
+ socklen_t salen;
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
struct sockaddr_un sa;
#else
@@ -831,7 +833,8 @@
ret = select(listensock+1, &rdset, NULL, NULL, &tv);
if(ret == 1 && wholistens == -2) {
- ret = accept(listensock, &sa, &salen);
+ salen = sizeof(sa);
+ ret = accept(listensock, (struct sockaddr *)&sa, &salen);
if(ret >= 0)
close(ret);
}
Index: innd/rc.c
===================================================================
RCS file: /nfs/localsrc/cvsroot/news/inn/innd/rc.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 rc.c
--- innd/rc.c 2001/02/22 20:06:32 1.1.1.2
+++ innd/rc.c 2001/02/24 21:44:45
@@ -119,7 +119,8 @@
struct sockaddr_in s_ident;
struct sockaddr_in s_local;
struct sockaddr_in s_distant;
- int ident_fd, len=sizeof(struct sockaddr);
+ int ident_fd;
+ socklen_t len = sizeof(struct sockaddr_in);
u_short port1,port2;
ssize_t lu;
More information about the inn-patches
mailing list