diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-08 13:26:26 +0000 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-08 13:26:26 +0000 |
commit | b8cb12aa2526e7490958439b453dc3a5c8b33948 (patch) | |
tree | 0ba0e44b5b57479b058c0d4f8597a5680438f522 | |
parent | df490a94b04debcc692837a36b15b7a2a67187dd (diff) | |
download | psutil-b8cb12aa2526e7490958439b453dc3a5c8b33948.tar.gz |
small refactoring
-rw-r--r-- | psutil/arch/bsd/netbsd.c | 4 | ||||
-rw-r--r-- | psutil/arch/bsd/openbsd.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/psutil/arch/bsd/netbsd.c b/psutil/arch/bsd/netbsd.c index 86dfec41..542c6998 100644 --- 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 index 24a05524..a29928ba 100644 --- 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; } |