Merge pull request #81 from gjasny/fix-compiler-warnings

Fix compiler warnings
resiprocate · Jul 13, 2017 · df93a44 · df93a44
2 parents 59732f0 + 358729f
commit df93a44
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/rutil/Data.cxx b/rutil/Data.cxx
@@ -368,8 +368,6 @@ Data::Data(Data &&data)
 // -2147483646
 static const int Int32MaxSize = 11;
 
-static const int MaxLongSize = (sizeof(unsigned long)/sizeof(int))*Int32MaxSize;
-
 // 18446744073709551615
 static const int UInt64MaxSize = 20;
 

diff --git a/rutil/dns/ares/ares_init.c b/rutil/dns/ares/ares_init.c
@@ -410,7 +410,7 @@ static void init_by_defaults_apple_nameservers(ares_channel channel)
   channel->nservers = 0;
   // .amr. iPhone/iOS SDK's don't support SCDynamicStoreCreate so in that case fall back
   // to the nservers=0 case.
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE
   store = SCDynamicStoreCreate(NULL, CFSTR("init_by_defaults_apple_nameservers"), NULL, &context);
 
   if (store)

diff --git a/rutil/dns/ares/ares_process.c b/rutil/dns/ares/ares_process.c
@@ -357,7 +357,7 @@ static void read_udp_packets(ares_channel channel, int server_idx,
           continue;
       /* Make sure the server has a socket and is selected in read_fds. */
       server = &channel->servers[i];
-      if ( (server->udp_socket == -1) )
+      if ( server->udp_socket == -1 )
           continue;
       if ( read_fds && !FD_ISSET(server->udp_socket, read_fds) )
 	  continue;