commit 7b9d996e4cd7d154bb1a244d67139aff0c363cf2
author Elliott Hughes <enh@google.com> Fri Apr 20 18:48:18 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Apr 20 18:57:19 2012 -0700
tree a9dabe8f910b4b8bf29c2f4285d860995e25f58d
parent 934100aea5a0f498c17e2c4a1fd0193af1557b42

Tidy up some C-isms.

Change-Id: I53b457cab9067369320457549071fc3e4c23c81b

src/jdwp/jdwp_socket.cc

diff --git a/src/jdwp/jdwp_socket.cc b/src/jdwp/jdwp_socket.cc
index 88af4ac..9ff50f5 100644
--- a/src/jdwp/jdwp_socket.cc
+++ b/src/jdwp/jdwp_socket.cc
@@ -59,7 +59,7 @@
     int     listenSock;         /* listen for connection from debugger */
     int     wakePipe[2];        /* break out of select */
 
-    struct in_addr remoteAddr;
+    in_addr remoteAddr;
     uint16_t remotePort;
 
     bool    awaitingHandshake;  /* waiting for "JDWP-Handshake" */
@@ -159,8 +159,8 @@
   }
 
   union {
-    struct sockaddr_in  addrInet;
-    struct sockaddr     addrPlain;
+    sockaddr_in  addrInet;
+    sockaddr     addrPlain;
   } addr;
   addr.addrInet.sin_family = AF_INET;
   addr.addrInet.sin_port = htons(port);
@@ -271,7 +271,7 @@
 static bool isFdReadable(int sock)
 {
     fd_set readfds;
-    struct timeval tv;
+    timeval tv;
     int count;
 
     FD_ZERO(&readfds);
@@ -332,8 +332,8 @@
 {
   JdwpNetState* netState = state->netState;
   union {
-    struct sockaddr_in  addrInet;
-    struct sockaddr     addrPlain;
+    sockaddr_in  addrInet;
+    sockaddr     addrPlain;
   } addr;
   socklen_t addrlen;
   int sock;
@@ -385,10 +385,10 @@
  */
 static bool establishConnection(JdwpState* state) {
   union {
-    struct sockaddr_in  addrInet;
-    struct sockaddr     addrPlain;
+    sockaddr_in  addrInet;
+    sockaddr     addrPlain;
   } addr;
-  struct hostent* pEntry;
+  hostent* pEntry;
 
   CHECK(state != NULL && state->netState != NULL);
   CHECK(!state->options_->server);
@@ -401,7 +401,7 @@
 //#undef HAVE_GETHOSTBYNAME_R
 //#warning "forcing non-R"
 #ifdef HAVE_GETHOSTBYNAME_R
-  struct hostent he;
+  hostent he;
   char auxBuf[128];
   int error;
   int cc = gethostbyname_r(state->options_->host.c_str(), &he, auxBuf, sizeof(auxBuf), &pEntry, &error);
@@ -705,8 +705,8 @@
       if (netState->listenSock >= 0 && FD_ISSET(netState->listenSock, &readfds)) {
         LOG(INFO) << "Ignoring second debugger -- accepting and dropping";
         union {
-          struct sockaddr_in   addrInet;
-          struct sockaddr      addrPlain;
+          sockaddr_in   addrInet;
+          sockaddr      addrPlain;
         } addr;
         socklen_t addrlen;
         int tmpSock;