summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d8140d5)
And fix the code so it doesn't generate warnings.
| RStringList _
| RHashtable _ ->
pr " jobjectArray jr;\n";
| RStringList _
| RHashtable _ ->
pr " jobjectArray jr;\n";
pr " jclass cl;\n";
pr " jstring jstr;\n";
pr " char **r;\n"
pr " jclass cl;\n";
pr " jstring jstr;\n";
pr " char **r;\n"
| Key n ->
pr " const char *%s;\n" n
| BufferIn n ->
| Key n ->
pr " const char *%s;\n" n
| BufferIn n ->
pr " size_t %s_size;\n" n
| StringList n | DeviceList n ->
pr " size_t %s_size;\n" n
| StringList n | DeviceList n ->
- pr " int %s_len;\n" n;
- pr " const char **%s;\n" n
+ pr " size_t %s_len;\n" n;
+ pr " char **%s;\n" n
| Bool n
| Int n ->
pr " int %s;\n" n
| Bool n
| Int n ->
pr " int %s;\n" n
*)
pr " %s = j%s ? (*env)->GetStringUTFChars (env, j%s, NULL) : NULL;\n" n n n
| BufferIn n ->
*)
pr " %s = j%s ? (*env)->GetStringUTFChars (env, j%s, NULL) : NULL;\n" n n n
| BufferIn n ->
- pr " %s = (*env)->GetByteArrayElements (env, j%s, NULL);\n" n n;
+ pr " %s = (char *) (*env)->GetByteArrayElements (env, j%s, NULL);\n" n n;
pr " %s_size = (*env)->GetArrayLength (env, j%s);\n" n n
| StringList n | DeviceList n ->
pr " %s_len = (*env)->GetArrayLength (env, j%s);\n" n n;
pr " %s_size = (*env)->GetArrayLength (env, j%s);\n" n n
| StringList n | DeviceList n ->
pr " %s_len = (*env)->GetArrayLength (env, j%s);\n" n n;
pr " for (i = 0; i < %s_len; ++i) {\n" n;
pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
n;
pr " for (i = 0; i < %s_len; ++i) {\n" n;
pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
n;
- pr " %s[i] = (*env)->GetStringUTFChars (env, o, NULL);\n" n;
+ pr " %s[i] = (char *) (*env)->GetStringUTFChars (env, o, NULL);\n" n;
pr " }\n";
pr " %s[%s_len] = NULL;\n" n n;
| Bool n
pr " }\n";
pr " %s[%s_len] = NULL;\n" n n;
| Bool n
pr " if (j%s)\n" n;
pr " (*env)->ReleaseStringUTFChars (env, j%s, %s);\n" n n
| BufferIn n ->
pr " if (j%s)\n" n;
pr " (*env)->ReleaseStringUTFChars (env, j%s, %s);\n" n n
| BufferIn n ->
- pr " (*env)->ReleaseByteArrayElements (env, j%s, %s, 0);\n" n n
+ pr " (*env)->ReleaseByteArrayElements (env, j%s, (jbyte *) %s, 0);\n" n n
| StringList n | DeviceList n ->
pr " for (i = 0; i < %s_len; ++i) {\n" n;
pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
| StringList n | DeviceList n ->
pr " for (i = 0; i < %s_len; ++i) {\n" n;
pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
(* Check for errors. *)
(match errcode_of_ret ret with
| `CannotReturnError -> ()
(* Check for errors. *)
(match errcode_of_ret ret with
| `CannotReturnError -> ()
- | `ErrorIsMinusOne ->
- pr " if (r == -1) {\n";
+ | (`ErrorIsMinusOne|`ErrorIsNULL) as errcode ->
+ (match errcode with
+ | `ErrorIsMinusOne ->
+ pr " if (r == -1) {\n";
+ | `ErrorIsNULL ->
+ pr " if (r == NULL) {\n";
+ );
pr " throw_exception (env, guestfs_last_error (g));\n";
pr " throw_exception (env, guestfs_last_error (g));\n";
- pr " return -1;\n";
- pr " }\n"
- | `ErrorIsNULL ->
- pr " if (r == NULL) {\n";
- pr " throw_exception (env, guestfs_last_error (g));\n";
- pr " return NULL;\n";
+ (match ret with
+ | RErr ->
+ pr " return;\n"
+ | RInt _
+ | RInt64 _
+ | RBool _ ->
+ pr " return -1;\n"
+ | RConstString _ | RConstOptString _ | RString _
+ | RBufferOut _
+ | RStruct _ | RHashtable _
+ | RStringList _ | RStructList _ ->
+ pr " return NULL;\n"
+ );
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-libguestfs_jni_la_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_builddir)/src $(JNI_CFLAGS)
+libguestfs_jni_la_CFLAGS = \
+ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+ -I$(top_srcdir)/src -I$(top_builddir)/src \
+ $(JNI_CFLAGS)
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h