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

jdwpspy/Net.cpp

diff --git a/jdwpspy/Net.cpp b/jdwpspy/Net.cpp
index 55515f1..5c789d8 100644
--- a/jdwpspy/Net.cpp
+++ b/jdwpspy/Net.cpp
@@ -52,7 +52,7 @@
     int     listenSock;
 
     /* connect here to contact VM */
-    struct in_addr vmAddr;
+    in_addr vmAddr;
     uint16_t vmPort;
 
     Peer    dbg;
@@ -258,12 +258,12 @@
         }
     }
 
-    struct sockaddr_in addr;
+    sockaddr_in addr;
     addr.sin_family = AF_INET;
     addr.sin_port = htons(listenPort);
     addr.sin_addr.s_addr = INADDR_ANY;
 
-    if (bind(netState->listenSock, (struct sockaddr*) &addr, sizeof(addr)) != 0)
+    if (bind(netState->listenSock, (sockaddr*) &addr, sizeof(addr)) != 0)
     {
         fprintf(stderr, "attempt to bind to port %u failed: %s\n",
             listenPort, strerror(errno));
@@ -280,7 +280,7 @@
     /*
      * Do the hostname lookup for the VM.
      */
-    struct hostent* pHost;
+    hostent* pHost;
 
     pHost = gethostbyname(connectHost);
     if (pHost == NULL) {
@@ -289,7 +289,7 @@
         goto fail;
     }
 
-    netState->vmAddr = *((struct in_addr*) pHost->h_addr_list[0]);
+    netState->vmAddr = *((in_addr*) pHost->h_addr_list[0]);
     netState->vmPort = connectPort;
 
     fprintf(stderr, "+++ connect host resolved to %s\n",
@@ -362,7 +362,7 @@
  */
 bool jdwpAcceptConnection(NetState* netState)
 {
-    struct sockaddr_in addr;
+    sockaddr_in addr;
     socklen_t addrlen;
     int sock;
 
@@ -373,7 +373,7 @@
 
     addrlen = sizeof(addr);
     do {
-        sock = accept(netState->listenSock, (struct sockaddr*) &addr, &addrlen);
+        sock = accept(netState->listenSock, (sockaddr*) &addr, &addrlen);
         if (sock < 0 && errno != EINTR) {
             fprintf(stderr, "accept failed: %s\n", strerror(errno));
             return false;
@@ -455,7 +455,7 @@
 static void getCurrentTime(int* pMin, int* pSec)
 {
     time_t now;
-    struct tm* ptm;
+    tm* ptm;
 
     now = time(NULL);
     ptm = localtime(&now);
@@ -683,7 +683,7 @@
  */
 bool jdwpConnectToVm(NetState* netState)
 {
-    struct sockaddr_in addr;
+    sockaddr_in addr;
     int sock = -1;
 
     sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);