From 06efeb5c0ee772cde7d551cfb41577df65f74470 Mon Sep 17 00:00:00 2001
From: dlezcano <dlezcano>
Date: Thu, 4 Sep 2008 09:46:22 +0000
Subject: [PATCH] Headers cleanup

---
 src/lxc/create.c  |  4 ----
 src/lxc/destroy.c |  8 +-------
 src/lxc/execute.c |  3 ---
 src/lxc/freezer.c | 16 ++++++----------
 src/lxc/kill.c    | 17 ++++++++---------
 src/lxc/start.c   |  4 ----
 src/lxc/stop.c    | 13 ++++---------
 7 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/lxc/create.c b/src/lxc/create.c
index 2891eba65..9beb29423 100644
--- a/src/lxc/create.c
+++ b/src/lxc/create.c
@@ -27,12 +27,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/param.h>
-#include <sys/inotify.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
 
diff --git a/src/lxc/destroy.c b/src/lxc/destroy.c
index 266a5ae04..601fef495 100644
--- a/src/lxc/destroy.c
+++ b/src/lxc/destroy.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#define _GNU_SOURCE
-#include <stdio.h>
-#undef _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,12 +28,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/param.h>
-#include <sys/inotify.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
+#include "monitor.h"
 
 static int dir_filter(const struct dirent *dirent)
 {
diff --git a/src/lxc/execute.c b/src/lxc/execute.c
index 888a84324..83d39ab95 100644
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -30,14 +30,11 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 #include <sys/mount.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
 
diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
index 38332bdf6..4f2dc4cd9 100644
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -29,34 +29,30 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/inotify.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
 
 static int freeze_unfreeze(const char *name, int freeze)
 {
-	char *freezer, *f = freeze?"FROZEN":"RUNNING";
+	char freezer[MAXPATHLEN], *f = freeze?"FROZEN":"RUNNING";
 	int fd, ret = -1;
 	
-	asprintf(&freezer, LXCPATH "/%s/nsgroup/freezer.state", name);
+	snprintf(freezer, MAXPATHLEN, 
+		 LXCPATH "/%s/nsgroup/freezer.state", name);
 
 	fd = open(freezer, O_WRONLY);
 	if (fd < 0) {
 		lxc_log_syserror("failed to open freezer for '%s'", name);
-		goto out;
+		return -1;
 	}
 
 	ret = write(fd, f, strlen(f) + 1) < 0;
 	close(fd);
 	if (ret) 
 		lxc_log_syserror("failed to write to '%s'", freezer);
-out:
-	free(freezer);
-	return ret;
+
+	return 0;
 }
 
 int lxc_freeze(const char *name)
diff --git a/src/lxc/kill.c b/src/lxc/kill.c
index 7af7f34f5..2fef19ea9 100644
--- a/src/lxc/kill.c
+++ b/src/lxc/kill.c
@@ -29,26 +29,26 @@
 #include <string.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
 
 int lxc_kill(const char *name, int signum)
 {
-	char *freezer = NULL, *signal = NULL;
+	char freezer[MAXPATHLEN], *signal = NULL;
 	int fd = -1, ret = -1;
 	
 	if (signum < SIGHUP || signum > SIGRTMAX) {
 		lxc_log_error("bad signal value %d", signum);
-		goto out;
+		return -1;
 	}
 
-	asprintf(&freezer, LXCPATH "/%s/nsgroup/freezer.kill", name);
-	asprintf(&signal, "%d", signum);
+	snprintf(freezer, MAXPATHLEN, LXCPATH "/%s/nsgroup/freezer.kill", name);
+
+	if (!asprintf(&signal, "%d", signum)) {
+		lxc_log_syserror("not enough memory");
+		return -1;
+	}
 
 	fd = open(freezer, O_WRONLY);
 	if (fd < 0) {
@@ -64,7 +64,6 @@ int lxc_kill(const char *name, int signum)
 	ret = 0;
 out:
 	close(fd);
-	free(freezer);
 	free(signal);
 	return ret;
 }
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 08eb5bb1e..cd7330a51 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -30,15 +30,11 @@
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
-#include <mntent.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
-#include <net/if.h>
 
 #include <lxc.h>
 
diff --git a/src/lxc/stop.c b/src/lxc/stop.c
index 7428846ea..7e9afda16 100644
--- a/src/lxc/stop.c
+++ b/src/lxc/stop.c
@@ -20,21 +20,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#define _GNU_SOURCE
 #include <stdio.h>
-#undef _GNU_SOURCE
-#include <fcntl.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <net/if.h>
+#include <fcntl.h>
 
 #include <lxc.h>