diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-11-02 11:59:25 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-11-02 14:36:36 +0000 |
| commit | 58720cc968366894366a430842b4bc5151b5f7fd (patch) | |
| tree | 9928510532182ec63fcc12176936f95f1e785660 /generator | |
| parent | 6f34b81321ad61adb2c22655ec68c57febbbe80b (diff) | |
| download | libguestfs-58720cc968366894366a430842b4bc5151b5f7fd.tar.gz libguestfs-58720cc968366894366a430842b4bc5151b5f7fd.tar.xz libguestfs-58720cc968366894366a430842b4bc5151b5f7fd.zip | |
generator: actions: Move variant functions to a separate file.
This is just code motion.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/c.ml | 25 | ||||
| -rw-r--r-- | generator/main.ml | 7 |
2 files changed, 26 insertions, 6 deletions
diff --git a/generator/c.ml b/generator/c.ml index 167ab86c..7b9c04d7 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1388,11 +1388,28 @@ and generate_client_actions () = List.iter ( fun f -> generate_daemon_stub f - ) daemon_functions; + ) daemon_functions + +(* Functions which have optional arguments have two or three + * generated variants. + *) +and generate_client_actions_variants () = + generate_header CStyle LGPLv2plus; + + pr "\ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <inttypes.h> + +#include \"guestfs.h\" +#include \"guestfs-internal.h\" +#include \"guestfs-internal-actions.h\" + +"; - (* Functions which have optional arguments have two or three - * generated variants. - *) let generate_va_variants { name = name; c_name = c_name; style = ret, args, optargs as style } = assert (optargs <> []); (* checked by caller *) diff --git a/generator/main.ml b/generator/main.ml index 98f4b31c..3a03f085 100644 --- a/generator/main.ml +++ b/generator/main.ml @@ -83,8 +83,6 @@ Run it from the top source directory using the command output_to "src/guestfs_protocol.x" generate_xdr; output_to "src/guestfs.h" generate_guestfs_h; output_to "src/guestfs-internal-actions.h" generate_internal_actions_h; - output_to "src/actions.c" generate_client_actions; - output_to "src/free-structs.c" generate_client_free_structs; output_to "src/bindtests.c" generate_bindtests; output_to "src/guestfs-structs.pod" generate_structs_pod; output_to "src/guestfs-actions.pod" generate_actions_pod; @@ -94,6 +92,11 @@ Run it from the top source directory using the command output_to "src/errnostring.h" generate_errnostring_h; output_to "src/MAX_PROC_NR" generate_max_proc_nr; output_to "src/libguestfs.syms" generate_linker_script; + + output_to "src/free-structs.c" generate_client_free_structs; + output_to "src/actions.c" generate_client_actions; + output_to "src/actions-variants.c" generate_client_actions_variants; + output_to "daemon/actions.h" generate_daemon_actions_h; output_to "daemon/stubs.c" generate_daemon_actions; output_to "daemon/names.c" generate_daemon_names; |