X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator%2Fgenerator_c.ml;h=8e43ea4b55f80423c84d91f7c6e0181f2fc79844;hb=1cf083b5c0101cb18337c60746ecab7b1bbeeca0;hp=c894354820926a885c6046710d593e0e92603333;hpb=1521c64102c36ec4ab75529d246c92802d3f310c;p=libguestfs.git

diff --git a/generator/generator_c.ml b/generator/generator_c.ml
index c894354..8e43ea4 100644
--- 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
@@ -1103,6 +1105,8 @@ check_state (guestfs_h *g, const char *caller)
             pr "  if (r == -1) {\n";
             pr "    guestfs___end_busy (g);\n";
             trace_return_error ~indent:4 style;
+            pr "    /* daemon will send an error reply which we discard */\n";
+            pr "    guestfs___recv_discard (g, \"%s\");\n" shortname;
             pr "    return %s;\n" (string_of_errcode errcode);
             pr "  }\n";
             pr "  if (r == -2) /* daemon cancelled */\n";