[libvirt] [libvirt-python PATCH 07/23] indent labels by one space

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-lxc-override.c | 2 +- libvirt-override.c | 112 ++++++++++++++++++++++++------------------------ libvirt-qemu-override.c | 2 +- libvirt-utils.c | 4 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index cdfbef6..2a3619e 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -94,7 +94,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(fdlist); return py_retval; -error: + error: for (i = 0; i < c_retval; i++) { VIR_FORCE_CLOSE(fdlist[i]); } diff --git a/libvirt-override.c b/libvirt-override.c index fa9b693..4c5590a 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -165,7 +165,7 @@ libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -301,7 +301,7 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(params, sumparams); return ret; -error: + error: virTypedParamsFree(params, sumparams); Py_DECREF(ret); return error; @@ -491,7 +491,7 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -539,7 +539,7 @@ libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -612,7 +612,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -688,7 +688,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, nparams); return ret; @@ -762,7 +762,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -809,7 +809,7 @@ libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -882,7 +882,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -929,7 +929,7 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -1002,7 +1002,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -1049,7 +1049,7 @@ libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -1123,7 +1123,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -1171,7 +1171,7 @@ libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -1291,7 +1291,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, return pyretval; -cleanup: + cleanup: VIR_FREE(cpuinfo); VIR_FREE(cpumap); Py_XDECREF(pyretval); @@ -1360,7 +1360,7 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, } ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: VIR_FREE(cpumap); return ret; } @@ -1424,7 +1424,7 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, } ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: VIR_FREE(cpumap); return ret; } @@ -1486,7 +1486,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, return pycpumaps; -cleanup: + cleanup: VIR_FREE(cpumaps); Py_XDECREF(pycpumaps); @@ -1695,7 +1695,7 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, py_retval = py_iothrinfo; py_iothrinfo = NULL; -cleanup: + cleanup: if (niothreads > 0) { for (i = 0; i < niothreads; i++) virDomainIOThreadInfoFree(iothrinfo[i]); @@ -1764,7 +1764,7 @@ libvirt_virDomainPinIOThread(PyObject *self ATTRIBUTE_UNUSED, } ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: VIR_FREE(cpumap); return ret; } @@ -2146,7 +2146,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, PyList_SET_ITEM(rv, i, str); } -done: + done: if (models) { for (i = 0; i < c_retval; i++) VIR_FREE(models[i]); @@ -2155,7 +2155,7 @@ done: return rv; -error: + error: Py_XDECREF(rv); rv = NULL; goto done; @@ -2273,7 +2273,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, doms[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (doms[i]) virDomainFree(doms[i]); @@ -2378,7 +2378,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -2424,7 +2424,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, snaps[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (snaps[i]) virDomainSnapshotFree(snaps[i]); @@ -2481,7 +2481,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -2527,7 +2527,7 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, snaps[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (snaps[i]) virDomainSnapshotFree(snaps[i]); @@ -3030,7 +3030,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, nets[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (nets[i]) virNetworkFree(nets[i]); @@ -3266,7 +3266,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(stats); return ret; -error: + error: VIR_FREE(stats); Py_XDECREF(key); Py_XDECREF(val); @@ -3331,7 +3331,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(stats); return ret; -error: + error: VIR_FREE(stats); Py_XDECREF(key); Py_XDECREF(val); @@ -3487,7 +3487,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, pools[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (pools[i]) virStoragePoolFree(pools[i]); @@ -3591,7 +3591,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, vols[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (vols[i]) virStorageVolFree(vols[i]); @@ -3858,7 +3858,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, devices[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (devices[i]) virNodeDeviceFree(devices[i]); @@ -4078,7 +4078,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, secrets[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (secrets[i]) virSecretFree(secrets[i]); @@ -4308,7 +4308,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, filters[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (filters[i]) virNWFilterFree(filters[i]); @@ -4468,7 +4468,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, ifaces[i] = NULL; } -cleanup: + cleanup: for (i = 0; i < c_retval; i++) if (ifaces[i]) virInterfaceFree(ifaces[i]); @@ -4604,7 +4604,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (dict) return dict; @@ -4667,7 +4667,7 @@ libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED, return dict; -error: + error: Py_DECREF(dict); Py_XDECREF(type); Py_XDECREF(bandwidth); @@ -4744,7 +4744,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, size); return ret; @@ -4792,7 +4792,7 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -4841,7 +4841,7 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, libvirt_intWrap(disks[i].error)); } -cleanup: + cleanup: if (disks) { for (i = 0; i < count; i++) VIR_FREE(disks[i].disk); @@ -4957,7 +4957,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, } } -cleanup: + cleanup: if (ifaces && ifaces_count > 0) { for (i = 0; i < ifaces_count; i++) { virDomainInterfaceFree(ifaces[i]); @@ -4967,7 +4967,7 @@ cleanup: return py_retval; -error: + error: Py_XDECREF(py_retval); py_retval = NULL; goto cleanup; @@ -5228,7 +5228,7 @@ libvirt_virEventAddHandleFunc(int fd, Py_XDECREF(result); Py_DECREF(pyobj_args); -cleanup: + cleanup: LIBVIRT_RELEASE_THREAD_STATE; return retval; @@ -5354,7 +5354,7 @@ libvirt_virEventAddTimeoutFunc(int timeout, Py_XDECREF(result); Py_DECREF(pyobj_args); -cleanup: + cleanup: LIBVIRT_RELEASE_THREAD_STATE; return retval; } @@ -5579,7 +5579,7 @@ libvirt_virEventHandleCallback(int watch, Py_DECREF(pyobj_ret); } -cleanup: + cleanup: LIBVIRT_RELEASE_THREAD_STATE; } @@ -5646,7 +5646,7 @@ libvirt_virEventTimeoutCallback(int timer, Py_DECREF(pyobj_ret); } -cleanup: + cleanup: LIBVIRT_RELEASE_THREAD_STATE; } @@ -7449,7 +7449,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED, py_retval = libvirt_charPtrSizeWrap(buf, size); -cleanup: + cleanup: VIR_FREE(buf); return py_retval; } @@ -7487,7 +7487,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED, py_retval = libvirt_charPtrSizeWrap(buf, size); -cleanup: + cleanup: VIR_FREE(buf); return py_retval; } @@ -7561,7 +7561,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, ret = VIR_PY_INT_SUCCESS; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(new_params, nparams); return ret; @@ -7608,7 +7608,7 @@ libvirt_virNodeGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, ret = getPyVirTypedParameter(params, nparams); -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; } @@ -7671,10 +7671,10 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, PyTuple_SetItem(ret, 2, pyonline) < 0) goto error; -cleanup: + cleanup: VIR_FREE(cpumap); return ret; -error: + error: Py_XDECREF(ret); Py_XDECREF(pycpumap); Py_XDECREF(pyused); @@ -7728,7 +7728,7 @@ libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_END_ALLOW_THREADS; py_retval = libvirt_intWrap((int) c_retval); -cleanup: + cleanup: VIR_FREE(files); return py_retval; } @@ -7776,7 +7776,7 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_END_ALLOW_THREADS; py_retval = libvirt_virDomainPtrWrap((virDomainPtr) c_retval); -cleanup: + cleanup: VIR_FREE(files); return py_retval; } @@ -7824,7 +7824,7 @@ libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, py_retval = libvirt_intWrap(c_retval); -cleanup: + cleanup: for (j = 0 ; j < i ; j++) VIR_FREE(mountpoints[j]); VIR_FREE(mountpoints); diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index d73f9bf..ad1693b 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -243,7 +243,7 @@ libvirt_qemu_virConnectDomainQemuMonitorEventCallback(virConnectPtr conn ATTRIBU Py_DECREF(pyobj_cbData); Py_DECREF(pyobj_dom); -cleanup: + cleanup: if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); PyErr_Print(); diff --git a/libvirt-utils.c b/libvirt-utils.c index 2dfffbc..02a28ac 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -402,7 +402,7 @@ setPyVirTypedParameter(PyObject *info, } return ret; -cleanup: + cleanup: virTypedParamsFree(ret, size); return NULL; } @@ -589,7 +589,7 @@ virPyDictToTypedParams(PyObject *dict, params = NULL; ret = 0; -cleanup: + cleanup: VIR_FREE(keystr); virTypedParamsFree(params, n); return ret; -- 2.5.3