mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

java: Tidy up the generated C bindings file.

Browse Source
This commit is contained in:
Richard W.M. Jones
2011-07-19 16:34:06 +01:00
parent d7da4807e8
commit 20480068ca
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
generator/generator_java.ml
View File

@@ -390,7 +390,6 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
pr "JNICALL\n";
pr "Java_com_redhat_et_libguestfs_GuestFS_";
pr "%s" (replace_str ("_" ^ name) "_" "_1");
pr "\n";
pr " (JNIEnv *env, jobject obj, jlong jg";
List.iter (
function
@@ -486,6 +485,11 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
pr " %s %s;\n" t n
) args;
if optargs <> [] then (
pr " struct guestfs_%s_argv optargs_s;\n" name;
pr " const struct guestfs_%s_argv *optargs = &optargs_s;\n" name
);
let needs_i =
(match ret with
| RStringList _ | RStructList _ | RHashtable _ -> true
@@ -537,8 +541,6 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
) args;
if optargs <> [] then (
pr " struct guestfs_%s_argv optargs_s;\n" name;
pr " const struct guestfs_%s_argv *optargs = &optargs_s;\n" name;
pr " optargs_s.bitmask = joptargs_bitmask;\n";
List.iter (
function
@@ -553,6 +555,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
) optargs;
);
pr "\n";
(* Make the call. *)
if optargs = [] then
pr " r = guestfs_%s " name
@@ -561,6 +565,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
generate_c_call_args ~handle:"g" style;
pr ";\n";
pr "\n";
(* Release the parameters. *)
List.iter (
function
@@ -599,6 +605,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
| _ -> assert false
) optargs;
pr "\n";
(* Check for errors. *)
(match errcode_of_ret ret with
| `CannotReturnError -> ()