[CRIU] [PATCH 5/5] compel plugins uapi: rename includes

Kir Kolyshkin kir at openvz.org
Sat Mar 4 21:42:51 PST 2017


The statement like

	#include <compel/plugins/plugin-std.h>

looks a bit tautological. I think the single "plugins" word is enough:

	#include <compel/plugins/std.h>

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 compel/plugins/include/uapi/{plugin-shmem.h => shmem.h} | 0
 compel/plugins/include/uapi/{plugin-std.h => std.h}     | 0
 compel/plugins/shmem/shmem.c                            | 2 +-
 compel/plugins/std/fds.c                                | 2 +-
 compel/plugins/std/infect.c                             | 2 +-
 compel/plugins/std/std.c                                | 2 +-
 compel/test/infect/parasite.c                           | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename compel/plugins/include/uapi/{plugin-shmem.h => shmem.h} (100%)
 rename compel/plugins/include/uapi/{plugin-std.h => std.h} (100%)

diff --git a/compel/plugins/include/uapi/plugin-shmem.h b/compel/plugins/include/uapi/shmem.h
similarity index 100%
rename from compel/plugins/include/uapi/plugin-shmem.h
rename to compel/plugins/include/uapi/shmem.h
diff --git a/compel/plugins/include/uapi/plugin-std.h b/compel/plugins/include/uapi/std.h
similarity index 100%
rename from compel/plugins/include/uapi/plugin-std.h
rename to compel/plugins/include/uapi/std.h
diff --git a/compel/plugins/shmem/shmem.c b/compel/plugins/shmem/shmem.c
index 1489df6..c2d56c2 100644
--- a/compel/plugins/shmem/shmem.c
+++ b/compel/plugins/shmem/shmem.c
@@ -1,7 +1,7 @@
 #include <sys/mman.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-shmem.h>
+#include <compel/plugins/shmem.h>
 #include <compel/plugins/std/syscall.h>
 #include "shmem.h"
 #include "std-priv.h"
diff --git a/compel/plugins/std/fds.c b/compel/plugins/std/fds.c
index eaa1271..4991027 100644
--- a/compel/plugins/std/fds.c
+++ b/compel/plugins/std/fds.c
@@ -1,7 +1,7 @@
 #include <errno.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "std-priv.h"
 
diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index 5f195f1..2d3aa3d 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -1,4 +1,4 @@
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "common/scm.h"
 #include "common/compiler.h"
diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index ec04665..82f51ea 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "asm/prologue.h"
 
diff --git a/compel/test/infect/parasite.c b/compel/test/infect/parasite.c
index 17bf3d6..bdbe722 100644
--- a/compel/test/infect/parasite.c
+++ b/compel/test/infect/parasite.c
@@ -1,6 +1,6 @@
 #include <errno.h>
 
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 /*
  * Stubs for std compel plugin.
-- 
2.9.3



More information about the CRIU mailing list