git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change strncmp(...) != 0 to STRNEQLEN(...)
[libguestfs.git]
/
src
/
generator.ml
diff --git
a/src/generator.ml
b/src/generator.ml
old mode 100755
(executable)
new mode 100644
(file)
index
8b83496
..
aff6356
--- a/
src/generator.ml
+++ b/
src/generator.ml
@@
-4688,7
+4688,7
@@
and generate_xdr () =
List.iter (
function
| Pathname n | Device n | Dev_or_Path n | String n ->
List.iter (
function
| Pathname n | Device n | Dev_or_Path n | String n ->
- pr " string %s<>;\n" n
+
pr " string %s<>;\n" n
| OptString n -> pr " str *%s;\n" n
| StringList n | DeviceList n -> pr " str %s<>;\n" n
| Bool n -> pr " bool %s;\n" n
| OptString n -> pr " str *%s;\n" n
| StringList n | DeviceList n -> pr " str %s<>;\n" n
| Bool n -> pr " bool %s;\n" n
@@
-6146,7
+6146,7
@@
and generate_one_test_body name i test_name init test =
pr " fprintf (stderr, \"%s: returned size of buffer wrong, expected %d but got %%zu\\n\", size);\n" test_name len;
pr " return -1;\n";
pr " }\n";
pr " fprintf (stderr, \"%s: returned size of buffer wrong, expected %d but got %%zu\\n\", size);\n" test_name len;
pr " return -1;\n";
pr " }\n";
- pr " if (
strncmp (r, expected, size) != 0
) {\n";
+ pr " if (
STRNEQLEN (r, expected, size)
) {\n";
pr " fprintf (stderr, \"%s: expected \\\"%%s\\\" but got \\\"%%s\\\"\\n\", expected, r);\n" test_name;
pr " return -1;\n";
pr " }\n"
pr " fprintf (stderr, \"%s: expected \\\"%%s\\\" but got \\\"%%s\\\"\\n\", expected, r);\n" test_name;
pr " return -1;\n";
pr " }\n"
@@
-6430,11
+6430,11
@@
and generate_fish_cmds () =
else "" in
pr " if (";
else "" in
pr " if (";
- pr "
strcasecmp (cmd, \"%s\") == 0
" name;
+ pr "
STRCASEEQ (cmd, \"%s\")
" name;
if name <> name2 then
if name <> name2 then
- pr " ||
strcasecmp (cmd, \"%s\") == 0
" name2;
+ pr " ||
STRCASEEQ (cmd, \"%s\")
" name2;
if name <> alias then
if name <> alias then
- pr " ||
strcasecmp (cmd, \"%s\") == 0
" alias;
+ pr " ||
STRCASEEQ (cmd, \"%s\")
" alias;
pr ")\n";
pr " pod2text (\"%s\", _(\"%s\"), %S);\n"
name2 shortdesc
pr ")\n";
pr " pod2text (\"%s\", _(\"%s\"), %S);\n"
name2 shortdesc
@@
-6581,11
+6581,11
@@
and generate_fish_cmds () =
function
| Device name
| String name ->
function
| Device name
| String name ->
- pr " %s = argv[%d];\n" name i
+
pr " %s = argv[%d];\n" name i
| Pathname name
| Dev_or_Path name ->
| Pathname name
| Dev_or_Path name ->
- pr " %s = resolve_win_path (argv[%d]);\n" name i;
- pr " if (%s == NULL) return -1;\n" name
+
pr " %s = resolve_win_path (argv[%d]);\n" name i;
+
pr " if (%s == NULL) return -1;\n" name
| OptString name ->
pr " %s = strcmp (argv[%d], \"\") != 0 ? argv[%d] : NULL;\n"
name i i
| OptString name ->
pr " %s = strcmp (argv[%d], \"\") != 0 ? argv[%d] : NULL;\n"
name i i
@@
-6692,11
+6692,11
@@
and generate_fish_cmds () =
try find_map (function FishAlias n -> Some n | _ -> None) flags
with Not_found -> name in
pr " if (";
try find_map (function FishAlias n -> Some n | _ -> None) flags
with Not_found -> name in
pr " if (";
- pr "
strcasecmp (cmd, \"%s\") == 0
" name;
+ pr "
STRCASEEQ (cmd, \"%s\")
" name;
if name <> name2 then
if name <> name2 then
- pr " ||
strcasecmp (cmd, \"%s\") == 0
" name2;
+ pr " ||
STRCASEEQ (cmd, \"%s\")
" name2;
if name <> alias then
if name <> alias then
- pr " ||
strcasecmp (cmd, \"%s\") == 0
" alias;
+ pr " ||
STRCASEEQ (cmd, \"%s\")
" alias;
pr ")\n";
pr " return run_%s (cmd, argc, argv);\n" name;
pr " else\n";
pr ")\n";
pr " return run_%s (cmd, argc, argv);\n" name;
pr " else\n";
@@
-7255,7
+7255,7
@@
copy_table (char * const * argv)
| StringList n | DeviceList n ->
pr " ocaml_guestfs_free_strings (%s);\n" n;
| Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _
| StringList n | DeviceList n ->
pr " ocaml_guestfs_free_strings (%s);\n" n;
| Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _
- | Bool _ | Int _ | Int64 _
+
| Bool _ | Int _ | Int64 _
| FileIn _ | FileOut _ -> ()
) (snd style);
| FileIn _ | FileOut _ -> ()
) (snd style);
@@
-7506,7
+7506,7
@@
DESTROY (g)
List.iter (
function
| Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _
List.iter (
function
| Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _
- | Bool _ | Int _ | Int64 _
+
| Bool _ | Int _ | Int64 _
| FileIn _ | FileOut _ -> ()
| StringList n | DeviceList n -> pr " free (%s);\n" n
) (snd style)
| FileIn _ | FileOut _ -> ()
| StringList n | DeviceList n -> pr " free (%s);\n" n
) (snd style)
@@
-8160,8
+8160,8
@@
py_guestfs_close (PyObject *self, PyObject *args)
| Bool _ -> pr "i" (* XXX Python has booleans? *)
| Int _ -> pr "i"
| Int64 _ -> pr "L" (* XXX Whoever thought it was a good idea to
| Bool _ -> pr "i" (* XXX Python has booleans? *)
| Int _ -> pr "i"
| Int64 _ -> pr "L" (* XXX Whoever thought it was a good idea to
- * emulate C's int/long/long long in Python?
- *)
+
* emulate C's int/long/long long in Python?
+
*)
) (snd style);
pr ":guestfs_%s\",\n" name;
pr " &py_g";
) (snd style);
pr ":guestfs_%s\",\n" name;
pr " &py_g";
@@
-9129,7
+9129,7
@@
Java_com_redhat_et_libguestfs_GuestFS__1close
pr " free (%s);\n" n
| Bool n
| Int n
pr " free (%s);\n" n
| Bool n
| Int n
- | Int64 n -> ()
+
| Int64 n -> ()
) (snd style);
(* Check for errors. *)
) (snd style);
(* Check for errors. *)
@@
-9317,6
+9317,12
@@
module Guestfs (
pr "
) where
pr "
) where
+
+-- Unfortunately some symbols duplicate ones already present
+-- in Prelude. We don't know which, so we hard-code a list
+-- here.
+import Prelude hiding (truncate)
+
import Foreign
import Foreign.C
import Foreign.C.Types
import Foreign
import Foreign.C
import Foreign.C.Types