small refactoring

giampaolo · Jan 8, 2016 · b8cb12a · b8cb12a
1 parent df490a9
commit b8cb12a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/psutil/arch/bsd/netbsd.c b/psutil/arch/bsd/netbsd.c
@@ -429,9 +429,9 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
     struct uvmexp_sysctl uv;
     int mib[] = {CTL_VM, VM_UVMEXP2};
     long pagesize = getpagesize();
-    size = sizeof(uvmexp);
+    size = sizeof(uv);
 
-    if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) {
+    if (sysctl(mib, 2, &uv, &size, NULL, 0) < 0) {
         warn("failed to get vm.uvmexp");
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;

diff --git a/psutil/arch/bsd/openbsd.c b/psutil/arch/bsd/openbsd.c
@@ -389,14 +389,13 @@ psutil_swap_mem(PyObject *self, PyObject *args) {
     }
 
     if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
+        PyErr_NoMemory();
         return NULL;
     }
 
     if (swapctl(SWAP_STATS, swdev, nswap) == -1) {
-        free(swdev);
         PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
+        goto error;
     }
 
     // Total things up.
@@ -417,6 +416,10 @@ psutil_swap_mem(PyObject *self, PyObject *args) {
                          // swapent struct does not provide any info
                          // about it.
                          0, 0);
+
+error:
+    free(swdev);
+    return NULL;
 }