From: hadaq <hadaq>
Date: Tue, 24 Jun 2008 18:05:09 +0000 (+0000)
Subject: remove warning when compiled at 64-bit platform. Sergey Yurevich
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ca6d6beb0608d8845de8ab5f1331900a6a173f5c;p=daqdata.git

remove warning when compiled at 64-bit platform. Sergey Yurevich
---

diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index b747831..1ac15c4 100644
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.40 2008-03-31 17:45:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.41 2008-06-24 18:05:09 hadaq Exp $";
 
 
 #define _GNU_SOURCE
@@ -34,7 +34,7 @@ static int openUdp(NetTrans *my, unsigned long addr, int port, int fl)
 /*      retVal needs some positive initialization otherwise */
 /* 	it can get a random negative number and cause an error!  */
 /* 	S.Y. 05.07.2007 */
-	int retVal = 1363391884;
+	int retVal = 1;
 
 	assert(my != NULL);
 
@@ -45,13 +45,13 @@ static int openUdp(NetTrans *my, unsigned long addr, int port, int fl)
 	} else if (fl == O_RDONLY) {
 		int rcvBufLenReq = 1 * (1 << 20);
 		int rcvBufLenRet;
-		int rcvBufLenLen = sizeof(rcvBufLenReq);
+		size_t rcvBufLenLen = (size_t) sizeof(rcvBufLenReq);
 
 		if (setsockopt(my->fd, SOL_SOCKET, SO_RCVBUF, &rcvBufLenReq, rcvBufLenLen) == -1) {
 			syslog(LOG_WARNING, "setsockopt(..., SO_RCVBUF, ...): %s", strerror(errno));
 		}
 
-		if (getsockopt(my->fd, SOL_SOCKET, SO_RCVBUF, &rcvBufLenRet, &rcvBufLenLen) == -1) {
+		if (getsockopt(my->fd, SOL_SOCKET, SO_RCVBUF, &rcvBufLenRet, (socklen_t *)&rcvBufLenLen) == -1) {
 			syslog(LOG_WARNING, "getsockopt(..., SO_RCVBUF, ...): %s", strerror(errno));
 		}
 		if (rcvBufLenRet < rcvBufLenReq) {
@@ -166,13 +166,13 @@ int sendGeneric(NetTrans *my)
 int recvGeneric(NetTrans *my)
 {
 	int retVal;
-	int socklen = sizeof(my->spec.sa);
+	size_t socklen = (size_t) sizeof(my->spec.sa);
 
 	assert(NetTrans_invariant(my));
 
 	switch (my->type) {
 	case NetTransType_udp:
-		retVal = recvfrom(my->fd, my->pkt, my->mtuSize, 0, &my->spec.sa, &socklen);
+		retVal = recvfrom(my->fd, my->pkt, my->mtuSize, 0, &my->spec.sa, (socklen_t *)&socklen);
 		break;
 	}