a little cleanup won’t hurt

[lxc-userspace.git] / setns.c

diff --git a/setns.c b/setns.c
index e82bd26..36aa360 100644 (file)
--- a/setns.c
+++ b/setns.c
@@ -3,6 +3,25 @@
 #include <stdio.h>
 #include <asm/unistd.h>
 #include <sys/mount.h>
+#include <errno.h>
+
+static PyObject *
+proc_mount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = mount("none","/proc","proc",0,NULL);
+
+    return Py_BuildValue("i", sts);
+}
+
+static PyObject *
+proc_umount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = umount("/proc");
+
+    return Py_BuildValue("i", sts);
+}
 
 static PyObject *
 chfscontext(PyObject *self, PyObject *args)
@@ -15,38 +34,20 @@ chfscontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-        sts = -1;
+        sts = -errno;
         goto out;
     }
     
     if (setns(fd, 0)) {
-        sts = -1;
+        sts = -errno;
     }
     close(fd);
+    sts = 0;
 
 out:
     return Py_BuildValue("i", sts);
 }
 
-static PyObject *
-proc_mount(PyObject *self, PyObject *args)
-{
-    int sts; 
-    sts = mount("none","/proc","proc",0,NULL);
-
-    return Py_BuildValue("i", sts);
-}
-
-static PyObject *
-proc_umount(PyObject *self, PyObject *args)
-{
-    int sts; 
-    sts = umount("/proc");
-
-    return Py_BuildValue("i", sts);
-
-}
-
 static PyObject *
 chcontext(PyObject *self, PyObject *args)
 {
@@ -58,14 +59,15 @@ chcontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-        sts = -1;
+        sts = -errno;
         goto out;
     }
     
     if (setns(fd, 0)) {
-        sts = -1;
+        sts = -errno;
     }
     close(fd);
+    sts = 0;
 
 out:
     return Py_BuildValue("i", sts);