From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 12 Dec 2007 10:18:04 +0000 (+0000)
Subject: Fix indentation and use userspace error values.
X-Git-Tag: util-vserver-pl-0.1-1~6
X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=commitdiff_plain;h=f7c283432265411ff576299e577c67ca03dba8fb

Fix indentation and use userspace error values.
---

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 3ac9069..b20725c 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -430,7 +430,7 @@ get_mask(struct vc_net_addr *addr)
     addr->vna_prefix = 64;
     break;
   default:
-    errno = -EINVAL;
+    errno = EINVAL;
     return -1;
   }
 
@@ -505,12 +505,13 @@ vserver_net_remove(PyObject *self, PyObject *args)
   else {
     if (convert_address(ip, &addr) == -1)
       return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip);
-    addr.vna_type |= VC_NXA_TYPE_ADDR;
-  }
 
-  switch (get_mask(&addr)) {
-  case -1:
-    return PyErr_SetFromErrno(PyExc_OSError);
+    switch (get_mask(&addr)) {
+    case -1:
+      return PyErr_SetFromErrno(PyExc_OSError);
+    }
+
+    addr.vna_type |= VC_NXA_TYPE_ADDR;
   }
 
   if (vc_net_remove(nid, &addr) == -1 && errno != ESRCH)