trace: Print empty list correctly.

[libguestfs.git] / generator / generator_c.ml

diff --git a/generator/generator_c.ml b/generator/generator_c.ml
index c894354..64ddf9b 100644 (file)
--- a/generator/generator_c.ml
+++ b/generator/generator_c.ml
@@ -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";