From a7f9c642d2d2229815018a8a759a6654e3ca9e2a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Nov 2010 12:52:24 +0000 Subject: [PATCH] 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. (cherry picked from commit 9ff99418361cd1b56b00e4ffef52444021e60c72) --- daemon/available.c | 2 +- daemon/base64.c | 2 +- daemon/checksum.c | 2 +- daemon/command.c | 2 +- daemon/daemon.h | 2 +- daemon/dd.c | 2 +- daemon/debug.c | 2 +- daemon/df.c | 2 +- daemon/dir.c | 2 +- daemon/du.c | 2 +- daemon/ext2.c | 2 +- daemon/file.c | 2 +- daemon/fill.c | 2 +- daemon/find.c | 2 +- daemon/grep.c | 2 +- daemon/headtail.c | 2 +- daemon/initrd.c | 2 +- daemon/inotify.c | 2 +- daemon/is.c | 2 +- daemon/mknod.c | 2 +- daemon/proto.c | 2 +- daemon/selinux.c | 2 +- daemon/sleep.c | 2 +- daemon/stat.c | 2 +- daemon/statvfs.c | 2 +- daemon/swap.c | 2 +- daemon/tar.c | 2 +- daemon/truncate.c | 2 +- daemon/umask.c | 2 +- daemon/upload.c | 2 +- daemon/utimens.c | 2 +- daemon/wc.c | 2 +- daemon/xattr.c | 2 +- generator/generator_daemon.ml | 4 ++-- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/daemon/available.c b/daemon/available.c index 2a30cad..17ce1b1 100644 --- a/daemon/available.c +++ b/daemon/available.c @@ -22,7 +22,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/base64.c b/daemon/base64.c index 1d2d1d0..7e07a6a 100644 --- a/daemon/base64.c +++ b/daemon/base64.c @@ -23,7 +23,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/checksum.c b/daemon/checksum.c index e12a8a8..7967f0c 100644 --- a/daemon/checksum.c +++ b/daemon/checksum.c @@ -25,7 +25,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/command.c b/daemon/command.c index 48bed2d..8ad5db5 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -22,7 +22,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/daemon.h b/daemon/daemon.h index e4e7159..6e9788a 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -28,7 +28,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" /*-- in guestfsd.c --*/ extern int verbose; diff --git a/daemon/dd.c b/daemon/dd.c index c004d92..f08eb36 100644 --- a/daemon/dd.c +++ b/daemon/dd.c @@ -23,7 +23,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/debug.c b/daemon/debug.c index b6d9f68..091e741 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -28,7 +28,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/df.c b/daemon/df.c index cce41a0..a1ec706 100644 --- a/daemon/df.c +++ b/daemon/df.c @@ -23,7 +23,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/dir.c b/daemon/dir.c index bc54d51..383acd2 100644 --- a/daemon/dir.c +++ b/daemon/dir.c @@ -25,7 +25,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/du.c b/daemon/du.c index 942a699..7cf2f4a 100644 --- a/daemon/du.c +++ b/daemon/du.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/ext2.c b/daemon/ext2.c index b7ce627..725352e 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "c-ctype.h" #include "actions.h" diff --git a/daemon/file.c b/daemon/file.c index c16a00a..e3a3c30 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -25,7 +25,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/fill.c b/daemon/fill.c index 8686226..d78e6ee 100644 --- a/daemon/fill.c +++ b/daemon/fill.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/find.c b/daemon/find.c index 535e46f..626017d 100644 --- a/daemon/find.c +++ b/daemon/find.c @@ -26,7 +26,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/grep.c b/daemon/grep.c index 73e58dd..09683ef 100644 --- a/daemon/grep.c +++ b/daemon/grep.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/headtail.c b/daemon/headtail.c index 164f2b6..528cc09 100644 --- a/daemon/headtail.c +++ b/daemon/headtail.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/initrd.c b/daemon/initrd.c index 932564b..3c960b2 100644 --- a/daemon/initrd.c +++ b/daemon/initrd.c @@ -26,7 +26,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/inotify.c b/daemon/inotify.c index d5a5a73..807fb2f 100644 --- a/daemon/inotify.c +++ b/daemon/inotify.c @@ -28,7 +28,7 @@ #include #endif -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" #include "optgroups.h" diff --git a/daemon/is.c b/daemon/is.c index 4a834f4..6f35489 100644 --- a/daemon/is.c +++ b/daemon/is.c @@ -25,7 +25,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/mknod.c b/daemon/mknod.c index 2458a85..ee2d1ff 100644 --- a/daemon/mknod.c +++ b/daemon/mknod.c @@ -26,7 +26,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" #include "optgroups.h" diff --git a/daemon/proto.c b/daemon/proto.c index 02ee692..f3b1fc0 100644 --- 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; diff --git a/daemon/selinux.c b/daemon/selinux.c index e49e657..0bf6fd2 100644 --- a/daemon/selinux.c +++ b/daemon/selinux.c @@ -26,7 +26,7 @@ #include #endif -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" #include "optgroups.h" diff --git a/daemon/sleep.c b/daemon/sleep.c index 3b5d395..6e133bd 100644 --- a/daemon/sleep.c +++ b/daemon/sleep.c @@ -22,7 +22,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/stat.c b/daemon/stat.c index 0b3be4d..e245323 100644 --- a/daemon/stat.c +++ b/daemon/stat.c @@ -26,7 +26,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/statvfs.c b/daemon/statvfs.c index cf37b96..e5118e4 100644 --- a/daemon/statvfs.c +++ b/daemon/statvfs.c @@ -36,7 +36,7 @@ #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/swap.c b/daemon/swap.c index 5de6ba6..9077814 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -23,7 +23,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" #include "optgroups.h" diff --git a/daemon/tar.c b/daemon/tar.c index ce3ca78..072a566 100644 --- 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" diff --git a/daemon/truncate.c b/daemon/truncate.c index c2da382..2cc21b4 100644 --- a/daemon/truncate.c +++ b/daemon/truncate.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/umask.c b/daemon/umask.c index db4a2f2..1563c52 100644 --- a/daemon/umask.c +++ b/daemon/umask.c @@ -26,7 +26,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/upload.c b/daemon/upload.c index 623ad3a..c026af8 100644 --- a/daemon/upload.c +++ b/daemon/upload.c @@ -27,7 +27,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/utimens.c b/daemon/utimens.c index e836b4e..1da2169 100644 --- a/daemon/utimens.c +++ b/daemon/utimens.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/wc.c b/daemon/wc.c index 43e28e0..397d90c 100644 --- a/daemon/wc.c +++ b/daemon/wc.c @@ -24,7 +24,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" diff --git a/daemon/xattr.c b/daemon/xattr.c index 6d356fa..a5169cf 100644 --- a/daemon/xattr.c +++ b/daemon/xattr.c @@ -21,7 +21,7 @@ #include #include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" #include "optgroups.h" diff --git a/generator/generator_daemon.ml b/generator/generator_daemon.ml index 9d9fb0c..df9f965 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"; -- 1.8.3.1