From 864134765a33823e2040c012ec383bebd7dd5743 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 11:47:32 +1000 Subject: code cleanup: make more functions static or include their own headers. (bzr r11736) --- src/bind/javabind.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/bind/javabind.cpp') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index 0831ddf19..d2d01f0b3 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -111,7 +111,7 @@ String normalizePath(const String &str) /** * Convert a java string to a C++ string */ -String getString(JNIEnv *env, jstring jstr) +static String getString(JNIEnv *env, jstring jstr) { const char *chars = env->GetStringUTFChars(jstr, JNI_FALSE); String str = chars; @@ -138,62 +138,62 @@ String getExceptionString(JNIEnv *env) return buf; } -jint getObjInt(JNIEnv *env, jobject obj, const char *name) +static jint getObjInt(JNIEnv *env, jobject obj, const char *name) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "I"); return env->GetIntField(obj, fid); } -void setObjInt(JNIEnv *env, jobject obj, const char *name, jint val) +static void setObjInt(JNIEnv *env, jobject obj, const char *name, jint val) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "I"); env->SetIntField(obj, fid, val); } -jlong getObjLong(JNIEnv *env, jobject obj, const char *name) +static jlong getObjLong(JNIEnv *env, jobject obj, const char *name) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "J"); return env->GetLongField(obj, fid); } -void setObjLong(JNIEnv *env, jobject obj, const char *name, jlong val) +static void setObjLong(JNIEnv *env, jobject obj, const char *name, jlong val) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "J"); env->SetLongField(obj, fid, val); } -jfloat getObjFloat(JNIEnv *env, jobject obj, const char *name) +static jfloat getObjFloat(JNIEnv *env, jobject obj, const char *name) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "F"); return env->GetFloatField(obj, fid); } -void setObjFloat(JNIEnv *env, jobject obj, const char *name, jfloat val) +static void setObjFloat(JNIEnv *env, jobject obj, const char *name, jfloat val) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "F"); env->SetFloatField(obj, fid, val); } -jdouble getObjDouble(JNIEnv *env, jobject obj, const char *name) +static jdouble getObjDouble(JNIEnv *env, jobject obj, const char *name) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "D"); return env->GetDoubleField(obj, fid); } -void setObjDouble(JNIEnv *env, jobject obj, const char *name, jdouble val) +static void setObjDouble(JNIEnv *env, jobject obj, const char *name, jdouble val) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "D"); env->SetDoubleField(obj, fid, val); } -String getObjString(JNIEnv *env, jobject obj, const char *name) +static String getObjString(JNIEnv *env, jobject obj, const char *name) { jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "Ljava/lang/String;"); jstring jstr = (jstring)env->GetObjectField(obj, fid); return getString(env, jstr); } -void setObjString(JNIEnv *env, jobject obj, const char *name, const String &val) +static void setObjString(JNIEnv *env, jobject obj, const char *name, const String &val) { jstring jstr = env->NewStringUTF(val.c_str()); jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "Ljava/lang/String;"); @@ -725,7 +725,7 @@ static void populateClassPath(const String &javaroot, * This is provided to scripts can grab the current copy or the * repr tree. If anyone has a smarter way of doing this, please implement. */ -jstring JNICALL documentGet(JNIEnv *env, jobject /*obj*/, jlong /*ptr*/) +static jstring JNICALL documentGet(JNIEnv *env, jobject /*obj*/, jlong /*ptr*/) { //JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr; String buf = sp_repr_save_buf((SP_ACTIVE_DOCUMENT)->rdoc); @@ -737,7 +737,7 @@ jstring JNICALL documentGet(JNIEnv *env, jobject /*obj*/, jlong /*ptr*/) * This is provided to scripts can load an XML tree into Inkscape. * If anyone has a smarter way of doing this, please implement. */ -jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, jstring /*jstr*/) +static jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, jstring /*jstr*/) { /* JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr; @@ -752,7 +752,7 @@ jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, js * redirect its logging stream here. * For the main C++/Java bindings, see dobinding.cpp */ -void JNICALL logWrite(JNIEnv */*env*/, jobject /*obj*/, jlong ptr, jint ch) +static void JNICALL logWrite(JNIEnv */*env*/, jobject /*obj*/, jlong ptr, jint ch) { JavaBinderyImpl *bind = reinterpret_cast(ptr); bind->log(ch); -- cgit v1.2.3 From 6753a094002684a8f14232934c9cdeba13e00e8e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 18 Mar 2013 00:36:01 +0000 Subject: Fix -Wunused-function warnings (bzr r12221) --- src/bind/javabind.cpp | 83 --------------------------------------------------- 1 file changed, 83 deletions(-) (limited to 'src/bind/javabind.cpp') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index d2d01f0b3..8a66bac59 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -138,71 +138,6 @@ String getExceptionString(JNIEnv *env) return buf; } -static jint getObjInt(JNIEnv *env, jobject obj, const char *name) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "I"); - return env->GetIntField(obj, fid); -} - -static void setObjInt(JNIEnv *env, jobject obj, const char *name, jint val) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "I"); - env->SetIntField(obj, fid, val); -} - -static jlong getObjLong(JNIEnv *env, jobject obj, const char *name) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "J"); - return env->GetLongField(obj, fid); -} - -static void setObjLong(JNIEnv *env, jobject obj, const char *name, jlong val) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "J"); - env->SetLongField(obj, fid, val); -} - -static jfloat getObjFloat(JNIEnv *env, jobject obj, const char *name) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "F"); - return env->GetFloatField(obj, fid); -} - -static void setObjFloat(JNIEnv *env, jobject obj, const char *name, jfloat val) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "F"); - env->SetFloatField(obj, fid, val); -} - -static jdouble getObjDouble(JNIEnv *env, jobject obj, const char *name) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "D"); - return env->GetDoubleField(obj, fid); -} - -static void setObjDouble(JNIEnv *env, jobject obj, const char *name, jdouble val) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "D"); - env->SetDoubleField(obj, fid, val); -} - -static String getObjString(JNIEnv *env, jobject obj, const char *name) -{ - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "Ljava/lang/String;"); - jstring jstr = (jstring)env->GetObjectField(obj, fid); - return getString(env, jstr); -} - -static void setObjString(JNIEnv *env, jobject obj, const char *name, const String &val) -{ - jstring jstr = env->NewStringUTF(val.c_str()); - jfieldID fid = env->GetFieldID(env->GetObjectClass(obj), name, "Ljava/lang/String;"); - env->SetObjectField(obj, fid, jstr); -} - - - - //######################################################################## //# CONSTRUCTOR/DESTRUCTOR //######################################################################## @@ -241,40 +176,22 @@ JavaBinderyImpl::~JavaBinderyImpl() void err(const char *fmt, ...) { -#if 0 - va_list args; - fprintf(stderr, "JavaBinderyImpl err:"); - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); - fprintf(stderr, "\n"); -#else va_list args; g_warning("JavaBinderyImpl err:"); va_start(args, fmt); g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, fmt, args); va_end(args); g_warning("\n"); -#endif } void msg(const char *fmt, ...) { -#if 0 - va_list args; - fprintf(stdout, "JavaBinderyImpl:"); - va_start(args, fmt); - vfprintf(stdout, fmt, args); - va_end(args); - fprintf(stdout, "\n"); -#else va_list args; g_message("JavaBinderyImpl:"); va_start(args, fmt); g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, fmt, args); va_end(args); g_message("\n"); -#endif } -- cgit v1.2.3