Fix a bunch more lint.
(If you ignore the compilers, we've got relatively little lint now. Fits on
a single screen.)
Change-Id: I51389002894d4fd8cf46f79d2bac57079322a030
diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc
index 4577b59..6bc7820 100644
--- a/src/jdwp/jdwp_adb.cc
+++ b/src/jdwp/jdwp_adb.cc
@@ -190,7 +190,7 @@
/* first, ensure that we get a connection to the ADB daemon */
-retry:
+ retry:
if (netState->shuttingDown) {
return false;
}
@@ -240,10 +240,7 @@
#endif
/* now try to send our pid to the ADB daemon */
- do {
- ret = send( netState->controlSock, buff, 4, 0 );
- } while (ret < 0 && errno == EINTR);
-
+ ret = TEMP_FAILURE_RETRY(send(netState->controlSock, buff, 4, 0));
if (ret >= 0) {
VLOG(jdwp) << StringPrintf("PID sent as '%.*s' to ADB", 4, buff);
break;
@@ -256,7 +253,7 @@
PLOG(ERROR) << "Can't connect to ADB control socket";
}
- usleep( sleep_ms*1000 );
+ usleep(sleep_ms * 1000);
sleep_ms += (sleep_ms >> 1);
if (sleep_ms > sleep_max_ms) {
@@ -291,7 +288,7 @@
/*
* Connect out to a debugger (for server=n). Not required.
*/
-static bool establishConnection(JdwpState*) {
+static bool establishConnection(JdwpState*, const JdwpOptions*) {
return false;
}
@@ -627,7 +624,7 @@
*/
return handlePacket(state);
-fail:
+ fail:
closeConnection(state);
return false;
}