Author: vmpn
Date: Fri Jun 1 04:24:51 2012
New Revision: 1344983
URL: http://svn.apache.org/viewvc?rev=1344983&view=rev
Log:
JavaHL: Make handling of expr and whitespace after ret_val parameters
consistent accross macros
[ in subversion/bindings/javahl/native ]
* JNIUtil.h
(SVN_JNI_NULL_PTR_EX): parenthesize expr for safety
(SVN_JNI_NULL_PTR_EX, SVN_JNI_ERR, POP_AND_RETURN): eliminate unnecessary
whitespace after ret_val
Approved by: gstein
Modified:
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1344983&r1=1344982&r2=1344983&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Fri Jun 1
04:24:51 2012
@@ -214,9 +214,9 @@ class JNIUtil
*/
#define SVN_JNI_NULL_PTR_EX(expr, str, ret_val) \
- if (expr == NULL) { \
+ if ((expr) == NULL) { \
JNIUtil::throwNullPointerException(str); \
- return ret_val ; \
+ return ret_val; \
}
/**
@@ -235,7 +235,7 @@ class JNIUtil
svn_error_t *svn_jni_err__temp = (expr); \
if (svn_jni_err__temp != SVN_NO_ERROR) { \
JNIUtil::handleSVNError(svn_jni_err__temp); \
- return ret_val ; \
+ return ret_val; \
} \
} while (0)
@@ -251,7 +251,7 @@ class JNIUtil
do \
{ \
env->PopLocalFrame(NULL); \
- return ret_val ; \
+ return ret_val; \
} \
while (0)
