Revision: 2296
Author:
regra...@gmail.com
Date: Thu Jan 29 23:46:15 2015 UTC
Log: Cleanup some compile warnings for UDP
https://code.google.com/p/portals4/source/detail?r=2296
Modified:
/trunk/src/ib/ptl_recv.c
/trunk/src/ib/ptl_udp.c
=======================================
--- /trunk/src/ib/ptl_recv.c Thu Feb 27 15:20:01 2014 UTC
+++ /trunk/src/ib/ptl_recv.c Thu Jan 29 23:46:15 2015 UTC
@@ -898,7 +898,9 @@
static void *progress_thread(void *arg)
{
ni_t *ni = arg;
+#if WITH_TRANSPORT_SHMEM
int err = 0;
+#endif
while (!ni->catcher_stop
#if WITH_TRANSPORT_SHMEM
=======================================
--- /trunk/src/ib/ptl_udp.c Thu Jan 29 17:02:38 2015 UTC
+++ /trunk/src/ib/ptl_udp.c Thu Jan 29 23:46:15 2015 UTC
@@ -913,10 +913,10 @@
ntohs(big_buf->udp.src_addr.sin_port)) {
//ptl_info("found match for system, checking logical
NI \n");
//found a matching buf, check to see if addressing
mode is correct
- if (((!!(ni->options & PTL_NI_LOGICAL)) &&
+ if ((((!!(ni->options & PTL_NI_LOGICAL)) &&
(hdr->h1.physical == 0)) ||
((!!(ni->options & PTL_NI_PHYSICAL)) &&
- (hdr->h1.physical == 1)) &&
+ (hdr->h1.physical == 1))) &&
(hdr->h1.ni_type == ni->ni_type)) {
//this is an exact match
found_one = 1;
@@ -1056,7 +1056,7 @@
return NULL;
}
}
- thebuf->transfer.udp.data = &thebuf->internal_data;
+ thebuf->transfer.udp.data = (unsigned char*)&thebuf->internal_data;
thebuf->transfer.udp.my_iovec.iov_len = thebuf->length;
}