From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 17 Mar 2016 10:44:01 +0000 (+0100)
Subject: Drop paths.h include
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=865764de065585978d70624cfe4a4f960180879d;p=libvirt.git

Drop paths.h include

We include the file in plenty of places. This is mostly due to
historical reasons. The only place that needs something from the
header file is storage_backend_fs which opens _PATH_MOUNTED. But
it gets the file included indirectly via mntent.h. At no other
place in our code we need _PATH_.*. Drop the include and
configure check then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index eed2050229..d52ddd72e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,7 +323,7 @@ fi
 LIBS=$old_libs
 
 dnl Availability of various common headers (non-fatal if missing).
-AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \
+AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \
   sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
   sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \
   libtasn1.h sys/ucred.h sys/mount.h])
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index b1b55f0e02..8b5ec4c840 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -31,7 +31,6 @@
 #include <sys/un.h>
 #include <sys/personality.h>
 #include <unistd.h>
-#include <paths.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 01c2ed6b1f..a09a7e474f 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <paths.h>
 #include <pwd.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index c2d54ad530..e154a0f795 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <pwd.h>
 #include <sys/wait.h>
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ff01012722..08e784b2c4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -37,7 +37,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <paths.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/un.h>
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 9fcdc84118..84e1df8928 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <paths.h>
 #include <pwd.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 18e53a34b8..da3e6035b6 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -35,10 +35,6 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
-
 #include "internal.h"
 #include "datatypes.h"
 #include "virbitmap.h"
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 46b4017a34..e9219548b3 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -35,10 +35,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
-
 #include "internal.h"
 #include "viriptables.h"
 #include "vircommand.h"
diff --git a/src/util/virutil.c b/src/util/virutil.c
index bb9604a0c1..b401f8d496 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -45,9 +45,6 @@
 # include <libdevmapper.h>
 #endif
 
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
 #include <netdb.h>
 #ifdef HAVE_GETPWUID_R
 # include <pwd.h>
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 604e7a8ee3..e12a95acda 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <pwd.h>
 #include <sys/wait.h>
 #include <sys/time.h>
diff --git a/tests/testutils.c b/tests/testutils.c
index b1bd4e8877..88c4d4b253 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -54,10 +54,6 @@
 # endif
 #endif
 
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
-
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 VIR_LOG_INIT("tests.testutils");