git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: Tidy up documentation for md-stop.
[libguestfs.git]
/
generator
/
generator_java.ml
diff --git
a/generator/generator_java.ml
b/generator/generator_java.ml
index
4d51c53
..
68972bc
100644
(file)
--- a/
generator/generator_java.ml
+++ b/
generator/generator_java.ml
@@
-113,10
+113,6
@@
public class GuestFS {
doc ^ "\n\n" ^ protocol_limit_warning
else doc in
let doc =
doc ^ "\n\n" ^ protocol_limit_warning
else doc in
let doc =
- if List.mem DangerWillRobinson flags then
- doc ^ "\n\n" ^ danger_will_robinson
- else doc in
- let doc =
match deprecation_notice flags with
| None -> doc
| Some txt -> doc ^ "\n\n" ^ txt in
match deprecation_notice flags with
| None -> doc
| Some txt -> doc ^ "\n\n" ^ txt in
@@
-390,7
+386,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 "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
pr " (JNIEnv *env, jobject obj, jlong jg";
List.iter (
function
@@
-486,6
+481,11
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
pr " %s %s;\n" t n
) args;
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
let needs_i =
(match ret with
| RStringList _ | RStructList _ | RHashtable _ -> true
@@
-537,8
+537,6
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
) args;
if optargs <> [] then (
) 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
pr " optargs_s.bitmask = joptargs_bitmask;\n";
List.iter (
function
@@
-553,6
+551,8
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
) optargs;
);
) optargs;
);
+ pr "\n";
+
(* Make the call. *)
if optargs = [] then
pr " r = guestfs_%s " name
(* Make the call. *)
if optargs = [] then
pr " r = guestfs_%s " name
@@
-561,6
+561,8
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
generate_c_call_args ~handle:"g" style;
pr ";\n";
generate_c_call_args ~handle:"g" style;
pr ";\n";
+ pr "\n";
+
(* Release the parameters. *)
List.iter (
function
(* Release the parameters. *)
List.iter (
function
@@
-599,6
+601,8
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
| _ -> assert false
) optargs;
| _ -> assert false
) optargs;
+ pr "\n";
+
(* Check for errors. *)
(match errcode_of_ret ret with
| `CannotReturnError -> ()
(* Check for errors. *)
(match errcode_of_ret ret with
| `CannotReturnError -> ()