X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator%2Fgenerator_daemon.ml;h=e3d87e50e84095c9492c20960c8a7b91a7d3fb1a;hb=a4448956e9a815aff59cac3d98caf80f620fc4c4;hp=9d9fb0c13a50e05d9c2b4963a5e0c1bb333c939b;hpb=14490c3e1aac61c6ac90f28828896683f64f0dc9;p=libguestfs.git

diff --git a/generator/generator_daemon.ml b/generator/generator_daemon.ml
index 9d9fb0c..e3d87e5 100644
--- a/generator/generator_daemon.ml
+++ b/generator/generator_daemon.ml
@@ -33,7 +33,7 @@ open Generator_c
 let generate_daemon_actions_h () =
   generate_header CStyle GPLv2plus;
 
-  pr "#include \"../src/guestfs_protocol.h\"\n";
+  pr "#include \"guestfs_protocol.h\"\n";
   pr "\n";
 
   List.iter (
@@ -58,7 +58,7 @@ and generate_daemon_actions () =
   pr "\n";
   pr "#include \"daemon.h\"\n";
   pr "#include \"c-ctype.h\"\n";
-  pr "#include \"../src/guestfs_protocol.h\"\n";
+  pr "#include \"guestfs_protocol.h\"\n";
   pr "#include \"actions.h\"\n";
   pr "\n";
 
@@ -105,6 +105,7 @@ and generate_daemon_actions () =
              | BufferIn n ->
                  pr "  const char *%s;\n" n;
                  pr "  size_t %s_size;\n" n
+             | Pointer _ -> assert false
            ) args
       );
       pr "\n";
@@ -174,6 +175,7 @@ and generate_daemon_actions () =
              | BufferIn n ->
                  pr "  %s = args.%s.%s_val;\n" n n n;
                  pr "  %s_size = args.%s.%s_len;\n" n n n
+             | Pointer _ -> assert false
            ) args;
            pr "\n"
       );