swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

Revert "fix some things cppcheck found...some are TODO because i don't feel like investigating them"

Browse Source 
This reverts commit 173575e835.
This commit is contained in:
DarthArgus
2015-03-26 00:00:15 -05:00
parent 38e4dfee11
commit db15932436
15 changed files with 18 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/JNIWrappers.cpp
+1 -45
View File
@@ -78,9 +78,6 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...)
va_start(marker, constructorID);
LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->NewObjectV(clazz, constructorID, marker)));
va_end(marker);
if (result->getValue() == 0)
return LocalRef::cms_nullPtr;
return result;
@@ -190,11 +187,8 @@ LocalRefPtr callObjectMethod(const LocalRefParam & object, jmethodID methodID, .
{
va_list marker;
va_start(marker, methodID);
LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)));
va_end(marker);
LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)));
if (result->getValue() != 0)
return result;
}
@@ -211,9 +205,6 @@ LocalObjectArrayRefPtr callObjectArrayMethod(const LocalRefParam & object, jmeth
va_start(marker, methodID);
LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast<jobjectArray>(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))));
va_end(marker);
if (result->getValue() != 0)
return result;
}
@@ -230,9 +221,6 @@ LocalByteArrayRefPtr callByteArrayMethod(const LocalRefParam & object, jmethodID
va_start(marker, methodID);
LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast<jbyteArray>(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))));
va_end(marker);
if (result->getValue() != 0)
return result;
}
@@ -248,12 +236,7 @@ jint callIntMethod(const LocalRefParam & object, jmethodID methodID, ...)
va_list marker;
va_start(marker, methodID);
//TODO: find out what type of object the below returns and get into a var so we can
//va_end properly
return JavaLibrary::getEnv()->CallIntMethodV(object.getValue(), methodID, marker);
va_end(marker); //just to make cppcheck happy
}
return 0;
}
@@ -268,8 +251,6 @@ jlong callLongMethod(const LocalRefParam & object, jmethodID methodID, ...)
va_start(marker, methodID);
return JavaLibrary::getEnv()->CallLongMethodV(object.getValue(), methodID, marker);
va_end(marker); //make cppcheck happy
}
return 0;
}
@@ -284,8 +265,6 @@ jfloat callFloatMethod(const LocalRefParam & object, jmethodID methodID, ...)
va_start(marker, methodID);
return JavaLibrary::getEnv()->CallFloatMethodV(object.getValue(), methodID, marker);
va_end(marker); //make cppcheck happy
}
return 0;
}
@@ -300,8 +279,6 @@ jboolean callBooleanMethod(const LocalRefParam & object, jmethodID methodID, ...
va_start(marker, methodID);
return JavaLibrary::getEnv()->CallBooleanMethodV(object.getValue(), methodID, marker);
va_end(marker); //make cppcheck happy
}
return JNI_FALSE;
}
@@ -316,8 +293,6 @@ void callVoidMethod(const LocalRefParam & object, jmethodID methodID, ...)
va_start(marker, methodID);
JavaLibrary::getEnv()->CallVoidMethodV(object.getValue(), methodID, marker);
va_end(marker);
}
}
@@ -331,8 +306,6 @@ jboolean callNonvirtualBooleanMethod(const LocalRefParam & object, jclass clazz,
va_start(marker, methodID);
return JavaLibrary::getEnv()->CallNonvirtualBooleanMethodV(object.getValue(), clazz, methodID, marker);
va_end(marker); //make cppcheck happy
}
return JNI_FALSE;
}
@@ -345,8 +318,6 @@ void callStaticVoidMethod(jclass clazz, jmethodID methodID, ...)
va_start(marker, methodID);
JavaLibrary::getEnv()->CallStaticVoidMethodV(clazz, methodID, marker);
va_end(marker);
}
//-----------------------------------------------------------------------
@@ -357,9 +328,6 @@ LocalRefPtr callStaticObjectMethod(jclass clazz, jmethodID methodID, ...)
va_start(marker, methodID);
LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)));
va_end(marker); //make cppcheck happy
if (result->getValue() == 0)
return LocalRef::cms_nullPtr;
return result;
@@ -373,9 +341,6 @@ LocalObjectArrayRefPtr callStaticObjectArrayMethod(jclass clazz, jmethodID metho
va_start(marker, methodID);
LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast<jobjectArray>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))));
va_end(marker);
if (result->getValue() == 0)
return LocalObjectArrayRef::cms_nullPtr;
return result;
@@ -389,9 +354,6 @@ LocalByteArrayRefPtr callStaticByteArrayMethod(jclass clazz, jmethodID methodID,
va_start(marker, methodID);
LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast<jbyteArray>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))));
va_end(marker);
if (result->getValue() == 0)
return LocalByteArrayRef::cms_nullPtr;
return result;
@@ -445,9 +407,6 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID,
va_start(marker, methodID);
jobject result = JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker);
va_end(marker);
if (result != 0)
{
#ifdef _DEBUG
@@ -473,9 +432,6 @@ JavaStringPtr callStaticStringMethod(jclass clazz, jmethodID methodID, ...)
JavaStringPtr result(new JavaString(static_cast<jstring>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz,
methodID, marker))));
va_end(marker);
if (result->getValue() != 0)
return result;
return JavaString::cms_nullPtr;