Update to latest gnulib for stable-1.8 branch.

[libguestfs.git] / generator / generator_c.ml

diff --git a/generator/generator_c.ml b/generator/generator_c.ml
index fd341da..8e43ea4 100644 (file)
--- a/generator/generator_c.ml
+++ b/generator/generator_c.ml
@@ -253,7 +253,7 @@ I<The caller must free the returned buffer after use>.\n\n"
           pr "This function takes a key or passphrase parameter which
 could contain sensitive material.  Read the section
 L</KEYS AND PASSPHRASES> for more information.\n\n";
-        (match deprecation_notice flags with
+        (match deprecation_notice ~prefix:"guestfs_" flags with
          | None -> ()
          | Some txt -> pr "%s\n\n" txt
         );
@@ -833,12 +833,14 @@ check_state (guestfs_h *g, const char *caller)
      | RBufferOut _ ->
          pr "%s  guestfs___print_BufferOut (stderr, %s, *size_r);\n" indent rv
      | RStringList _ | RHashtable _ ->
-         pr "%s  fputs (\"[\\\"\", stderr);\n" indent;
+         pr "%s  fputs (\"[\", stderr);\n" indent;
          pr "%s  for (i = 0; %s[i]; ++i) {\n" indent rv;
-         pr "%s    if (i > 0) fputs (\"\\\", \\\"\", stderr);\n" indent;
+         pr "%s    if (i > 0) fputs (\", \", stderr);\n" indent;
+         pr "%s    fputs (\"\\\"\", stderr);\n" indent;
          pr "%s    fputs (%s[i], stderr);\n" indent rv;
+         pr "%s    fputs (\"\\\"\", stderr);\n" indent;
          pr "%s  }\n" indent;
-         pr "%s  fputs (\"\\\"]\", stderr);\n" indent;
+         pr "%s  fputs (\"]\", stderr);\n" indent;
      | RStruct (_, typ) ->
          (* XXX There is code generated for guestfish for printing
           * these structures.  We need to make it generally available