cleanup conf.h

src/lxc/Makefile.am

@@ -10,7 +10,7 @@ pkginclude_HEADERS = \
 		lock.h \
 		lxc.h \
 		cgroup.h \
-		lxc_conf.h \
+		conf.h \
 		lxc_list.h \
 		lxc_log.h \
 		lxc_state.h
@@ -34,7 +34,7 @@ liblxc_la_SOURCES = \
 	lxc_utils.h \
 	lock.c lock.h \
 	namespace.h \
-	lxc_conf.c lxc_conf.h \
+	conf.c conf.h \
 	lxc_list.h \
 	lxc_state.c lxc_state.h \
 	lxc_log.c lxc_log.h \

src/lxc/lxc_conf.h → src/lxc/conf.h

@@ -26,7 +26,7 @@
 #include <netinet/in.h>
 #include <sys/param.h>
 
-enum { 
+enum {
 	EMPTY,
 	VETH,
 	MACVLAN,
@@ -170,7 +170,7 @@ extern void lxc_delete_tty(struct lxc_tty_info *tty_info);
 /*
  * Configure the container from inside
  */
-extern int lxc_setup(const char *name, const char *tty, 
+extern int lxc_setup(const char *name, const char *tty,
 		     const struct lxc_tty_info *tty_info);
 
 extern int conf_has(const char *name, const char *info);

src/lxc/lxc.h

@@ -35,8 +35,8 @@ extern "C" {
 
 #include <lxc/lxc_state.h>
 #include <lxc/lxc_list.h>
-#include <lxc/lxc_conf.h>
 #include <lxc/lxc_log.h>
+#include <lxc/conf.h>
 #include <lxc/lock.h>
 #include <lxc/namespace.h>
 #include <lxc/utils.h>