summaryrefslogtreecommitdiffstats
path: root/runtime/jdwp
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-07-19 11:24:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-19 11:24:49 -0700
commitebd66389dacec3118232fbd426c70dbed573cff1 (patch)
tree7270c0974e643accf3899f1c76813e78780ec603 /runtime/jdwp
parentac43ae545ffca66aac813ed3e6ab54e3559b5e4e (diff)
parent4274889d48ef82369bf2c1ca70d84689b4f9e93a (diff)
downloadart-ebd66389dacec3118232fbd426c70dbed573cff1.zip
art-ebd66389dacec3118232fbd426c70dbed573cff1.tar.gz
art-ebd66389dacec3118232fbd426c70dbed573cff1.tar.bz2
am 4274889d: Fixing cpplint readability/check issues
* commit '4274889d48ef82369bf2c1ca70d84689b4f9e93a': Fixing cpplint readability/check issues
Diffstat (limited to 'runtime/jdwp')
-rw-r--r--runtime/jdwp/jdwp_adb.cc4
-rw-r--r--runtime/jdwp/jdwp_socket.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/jdwp/jdwp_adb.cc b/runtime/jdwp/jdwp_adb.cc
index 2bfe63e..cbf35be 100644
--- a/runtime/jdwp/jdwp_adb.cc
+++ b/runtime/jdwp/jdwp_adb.cc
@@ -297,7 +297,7 @@ bool JdwpAdbState::Accept() {
bool JdwpAdbState::ProcessIncoming() {
int readCount;
- CHECK(clientSock != -1);
+ CHECK_NE(clientSock, -1);
if (!HaveFullPacket()) {
/* read some more, looping until we have data */
@@ -371,7 +371,7 @@ bool JdwpAdbState::ProcessIncoming() {
LOG(INFO) << "Ignoring second debugger -- accepting and dropping";
close(sock);
} else {
- CHECK(control_sock_ == -1);
+ CHECK_EQ(control_sock_, -1);
/*
* Remote side most likely went away, so our next read
* on clientSock will fail and throw us out of the loop.
diff --git a/runtime/jdwp/jdwp_socket.cc b/runtime/jdwp/jdwp_socket.cc
index 87706a4..3f5546e 100644
--- a/runtime/jdwp/jdwp_socket.cc
+++ b/runtime/jdwp/jdwp_socket.cc
@@ -218,7 +218,7 @@ bool JdwpSocketState::Accept() {
return false; /* you're not listening! */
}
- CHECK(clientSock == -1); /* must not already be talking */
+ CHECK_EQ(clientSock, -1); /* must not already be talking */
addrlen = sizeof(addr);
do {
@@ -348,7 +348,7 @@ bool JdwpSocketState::Establish(const JdwpOptions* options) {
bool JdwpSocketState::ProcessIncoming() {
int readCount;
- CHECK(clientSock != -1);
+ CHECK_NE(clientSock, -1);
if (!HaveFullPacket()) {
/* read some more, looping until we have data */