Fix two compiler warnings.

Signed/unsigned comparison in "File.cpp", and && and || without parentheses
in "OpenSSLSocketImpl.cpp". There's another signed/unsigned comparison in
"ifaddrs-android.h" but that isn't fixable (http://b/2417132), which is
going to stand in the way of turning on -Werror.

2 files changed, 6 insertions, 6 deletions

diff --git a/libcore/luni/src/main/native/java_io_File.cpp b/libcore/luni/src/main/native/java_io_File.cpp
index ed25ce7b3..bd8136102 100644
--- a/libcore/luni/src/main/native/java_io_File.cpp
+++ b/libcore/luni/src/main/native/java_io_File.cpp
@@ -128,7 +128,7 @@ static jbyteArray java_io_File_getLinkImpl(JNIEnv* env, jobject, jbyteArray path
             // An error occurred.
             return pathBytes;
         }
-        if (len < buf.size() - 1) {
+        if (static_cast<size_t>(len) < buf.size() - 1) {
             // The buffer was big enough.
             // TODO: why do we bother with the NUL termination? (if you change this, remove the "- 1"s above.)
             buf[len] = '\0'; // readlink(2) doesn't NUL-terminate.
diff --git a/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp b/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp
index a3c86d6d1..20bb8a50c 100644
--- a/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp
+++ b/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp
@@ -1327,12 +1327,12 @@ static void org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl_accept(JNIEn
          */
         int sslErrorCode = SSL_get_error(ssl, ret);
         if (sslErrorCode == SSL_ERROR_NONE ||
-                sslErrorCode == SSL_ERROR_SYSCALL && errno == 0) {
-          throwIOExceptionStr(env, "Connection closed by peer");
+                (sslErrorCode == SSL_ERROR_SYSCALL && errno == 0)) {
+            throwIOExceptionStr(env, "Connection closed by peer");
         } else {
-          throwIOExceptionWithSslErrors(env, ret, sslErrorCode,
-              "Trouble accepting connection");
-    	}
+            throwIOExceptionWithSslErrors(env, ret, sslErrorCode,
+                    "Trouble accepting connection");
+        }
         free_ssl(env, object);
         return;
     } else if (ret < 0) {