From 0a807e587935a92811a2f3703caab87115363030 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 3 Feb 2010 12:42:27 -0800 Subject: 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. --- ...org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'x-net/src') diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp index a3c86d6..20bb8a5 100644 --- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp +++ b/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) { -- cgit v1.1