daemon: Don't use ../src path to include generator_protocol.h

This file is already hard-linked into the current directory, so the relative path is not required.
2026-03-21 22:53:37 +00:00 · 2010-11-03 12:52:24 +00:00
parent c5a6584c4f
commit 9ff9941836
34 changed files with 35 additions and 35 deletions
--- a/daemon/available.c
+++ b/daemon/available.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/checksum.c
+++ b/daemon/checksum.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/command.c
+++ b/daemon/command.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -28,7 +28,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"

 /*-- in guestfsd.c --*/
 extern int verbose;
--- a/daemon/dd.c
+++ b/daemon/dd.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -28,7 +28,7 @@
 #include <dirent.h>
 #include <sys/resource.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/df.c
+++ b/daemon/df.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/du.c
+++ b/daemon/du.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <inttypes.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "c-ctype.h"
 #include "actions.h"
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/fill.c
+++ b/daemon/fill.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/find.c
+++ b/daemon/find.c
@@ -26,7 +26,7 @@
 #include <limits.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -28,7 +28,7 @@
 #include <sys/inotify.h>
 #endif

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- a/daemon/is.c
+++ b/daemon/is.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/mknod.c
+++ b/daemon/mknod.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -38,7 +38,7 @@
 #include "ignore-value.h"

 #include "daemon.h"
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"

 /* The message currently being processed. */
 int proc_nr;
--- a/daemon/selinux.c
+++ b/daemon/selinux.c
@@ -26,7 +26,7 @@
 #include <selinux/selinux.h>
 #endif

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- a/daemon/sleep.c
+++ b/daemon/sleep.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/stat.c
+++ b/daemon/stat.c
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/statvfs.c
+++ b/daemon/statvfs.c
@@ -36,7 +36,7 @@

 #include <fsusage.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -25,7 +25,7 @@

 #include "read-file.h"

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- a/daemon/truncate.c
+++ b/daemon/truncate.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <sys/types.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/umask.c
+++ b/daemon/umask.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/utimens.c
+++ b/daemon/utimens.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <sys/stat.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

--- a/daemon/xattr.c
+++ b/daemon/xattr.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <unistd.h>

-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
--- 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";