git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guestfish: Fix a third indentation problem.
[libguestfs.git]
/
src
/
generator.ml
diff --git
a/src/generator.ml
b/src/generator.ml
index
4e056e2
..
3249459
100755
(executable)
--- a/
src/generator.ml
+++ b/
src/generator.ml
@@
-3915,7
+3915,7
@@
type rstructs_used_t = RStructOnly | RStructListOnly | RStructAndList
* == there are functions returning both RStruct (_, structname)
* and RStructList (_, structname)
*)
* == there are functions returning both RStruct (_, structname)
* and RStructList (_, structname)
*)
-let rstructs_used =
+let rstructs_used
_by functions
=
(* ||| is a "logical OR" for rstructs_used_t *)
let (|||) a b =
match a, b with
(* ||| is a "logical OR" for rstructs_used_t *)
let (|||) a b =
match a, b with
@@
-3944,21
+3944,11
@@
let rstructs_used =
| RStruct (_, structname) -> update structname RStructOnly
| RStructList (_, structname) -> update structname RStructListOnly
| _ -> ()
| RStruct (_, structname) -> update structname RStructOnly
| RStructList (_, structname) -> update structname RStructListOnly
| _ -> ()
- )
all_
functions;
+ ) functions;
(* return key->values as a list of (key,value) *)
Hashtbl.fold (fun key value xs -> (key, value) :: xs) h []
(* return key->values as a list of (key,value) *)
Hashtbl.fold (fun key value xs -> (key, value) :: xs) h []
-(* debug:
-let () =
- List.iter (
- function
- | sn, RStructOnly -> printf "%s RStructOnly\n" sn
- | sn, RStructListOnly -> printf "%s RStructListOnly\n" sn
- | sn, RStructAndList -> printf "%s RStructAndList\n" sn
- ) rstructs_used
-*)
-
(* Used for testing language bindings. *)
type callt =
| CallString of string
(* Used for testing language bindings. *)
type callt =
| CallString of string
@@
-6291,17
+6281,17
@@
and generate_fish_cmds () =
| name, FString ->
pr " printf (\"%%s%s: %%s\\n\", indent, %s->%s);\n" name typ name
| name, FUUID ->
| name, FString ->
pr " printf (\"%%s%s: %%s\\n\", indent, %s->%s);\n" name typ name
| name, FUUID ->
- pr " printf (\"%
s: \"
);\n" name;
+ pr " printf (\"%
%s%s: \", indent
);\n" name;
pr " for (i = 0; i < 32; ++i)\n";
pr " for (i = 0; i < 32; ++i)\n";
- pr " printf (\"%%
s%%c\", indent
, %s->%s[i]);\n" typ name;
+ pr " printf (\"%%
c\"
, %s->%s[i]);\n" typ name;
pr " printf (\"\\n\");\n"
| name, FBuffer ->
pr " printf (\"%%s%s: \", indent);\n" name;
pr " for (i = 0; i < %s->%s_len; ++i)\n" typ name;
pr " if (c_isprint (%s->%s[i]))\n" typ name;
pr " printf (\"\\n\");\n"
| name, FBuffer ->
pr " printf (\"%%s%s: \", indent);\n" name;
pr " for (i = 0; i < %s->%s_len; ++i)\n" typ name;
pr " if (c_isprint (%s->%s[i]))\n" typ name;
- pr " printf (\"%%
s%%c\", indent
, %s->%s[i]);\n" typ name;
+ pr " printf (\"%%
c\"
, %s->%s[i]);\n" typ name;
pr " else\n";
pr " else\n";
- pr " printf (\"
%%s\\\\x%%02x\", indent
, %s->%s[i]);\n" typ name;
+ pr " printf (\"
\\\\x%%02x\"
, %s->%s[i]);\n" typ name;
pr " printf (\"\\n\");\n"
| name, (FUInt64|FBytes) ->
pr " printf (\"%%s%s: %%\" PRIu64 \"\\n\", indent, %s->%s);\n"
pr " printf (\"\\n\");\n"
| name, (FUInt64|FBytes) ->
pr " printf (\"%%s%s: %%\" PRIu64 \"\\n\", indent, %s->%s);\n"
@@
-6334,19
+6324,19
@@
and generate_fish_cmds () =
(* generate the function for typ *)
emit_print_list_function typ
| typ, _ -> () (* empty *)
(* generate the function for typ *)
emit_print_list_function typ
| typ, _ -> () (* empty *)
- )
rstructs_used
;
+ )
(rstructs_used_by all_functions)
;
(* Emit a print_TYPE function definition only if that function is used. *)
List.iter (
function
(* Emit a print_TYPE function definition only if that function is used. *)
List.iter (
function
- | typ,
RStructOnly
->
+ | typ,
(RStructOnly | RStructAndList)
->
pr "static void print_%s (struct guestfs_%s *%s)\n" typ typ typ;
pr "{\n";
pr " print_%s_indent (%s, \"\");\n" typ typ;
pr "}\n";
pr "\n";
| typ, _ -> () (* empty *)
pr "static void print_%s (struct guestfs_%s *%s)\n" typ typ typ;
pr "{\n";
pr " print_%s_indent (%s, \"\");\n" typ typ;
pr "}\n";
pr "\n";
| typ, _ -> () (* empty *)
- )
rstructs_used
;
+ )
(rstructs_used_by all_functions)
;
(* run_<action> actions *)
List.iter (
(* run_<action> actions *)
List.iter (
@@
-6942,7
+6932,7
@@
copy_table (char * const * argv)
(* generate the function for typ *)
emit_ocaml_copy_list_function typ
| typ, _ -> () (* empty *)
(* generate the function for typ *)
emit_ocaml_copy_list_function typ
| typ, _ -> () (* empty *)
- )
rstructs_used
;
+ )
(rstructs_used_by all_functions)
;
(* The wrappers. *)
List.iter (
(* The wrappers. *)
List.iter (
@@
-7888,7
+7878,7
@@
py_guestfs_close (PyObject *self, PyObject *args)
(* generate the function for typ *)
emit_put_list_function typ
| typ, _ -> () (* empty *)
(* generate the function for typ *)
emit_put_list_function typ
| typ, _ -> () (* empty *)
- )
rstructs_used
;
+ )
(rstructs_used_by all_functions)
;
(* Python wrapper functions. *)
List.iter (
(* Python wrapper functions. *)
List.iter (