summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xgenerator.py8
-rw-r--r--libvirt-override.c216
-rw-r--r--libvirt-qemu-override.c4
-rw-r--r--typewrappers.c76
4 files changed, 152 insertions, 152 deletions
diff --git a/generator.py b/generator.py
index cb55740..9530867 100755
--- a/generator.py
+++ b/generator.py
@@ -589,7 +589,7 @@ def print_function_wrapper(module, name, output, export, include):
args[1][0])
else:
c_call = "\n %s(%s);\n" % (name, c_call);
- ret_convert = " Py_INCREF(Py_None);\n return(Py_None);\n"
+ ret_convert = " Py_INCREF(Py_None);\n return Py_None;\n"
elif py_types.has_key(ret[0]):
(f, t, n, c) = py_types[ret[0]]
c_return = " %s c_retval;\n" % (ret[0])
@@ -598,13 +598,13 @@ def print_function_wrapper(module, name, output, export, include):
else:
c_call = "\n c_retval = %s(%s);\n" % (name, c_call);
ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c)
- ret_convert = ret_convert + " return(py_retval);\n"
+ ret_convert = ret_convert + " return py_retval;\n"
elif py_return_types.has_key(ret[0]):
(f, t, n, c) = py_return_types[ret[0]]
c_return = " %s c_retval;\n" % (ret[0])
c_call = "\n c_retval = %s(%s);\n" % (name, c_call);
ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c)
- ret_convert = ret_convert + " return(py_retval);\n"
+ ret_convert = ret_convert + " return py_retval;\n"
else:
if skipped_types.has_key(ret[0]):
return 0
@@ -663,7 +663,7 @@ def print_function_wrapper(module, name, output, export, include):
if format != "":
output.write("\n if (!PyArg_ParseTuple(args, (char *)\"%s\"%s))\n" %
(format, format_args))
- output.write(" return(NULL);\n")
+ output.write(" return NULL;\n")
if c_convert != "":
output.write(c_convert + "\n")
diff --git a/libvirt-override.c b/libvirt-override.c
index da1bceb..f55ef43 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -308,7 +308,7 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainBlockStats",
&pyobj_domain,&path))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -326,7 +326,7 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.wr_req));
PyTuple_SetItem(info, 3, PyLong_FromLongLong(stats.wr_bytes));
PyTuple_SetItem(info, 4, PyLong_FromLongLong(stats.errs));
- return(info);
+ return info;
}
static PyObject *
@@ -534,7 +534,7 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainInterfaceStats",
&pyobj_domain,&path))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -555,7 +555,7 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
PyTuple_SetItem(info, 5, PyLong_FromLongLong(stats.tx_packets));
PyTuple_SetItem(info, 6, PyLong_FromLongLong(stats.tx_errs));
PyTuple_SetItem(info, 7, PyLong_FromLongLong(stats.tx_drop));
- return(info);
+ return info;
}
static PyObject *
@@ -567,7 +567,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyObject *info;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainMemoryStats", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
nr_stats = virDomainMemoryStats(domain, stats,
@@ -618,7 +618,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetScedulerType",
&pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -636,7 +636,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(c_retval));
PyTuple_SetItem(info, 1, PyInt_FromLong((long)nparams));
VIR_FREE(c_retval);
- return(info);
+ return info;
}
static PyObject *
@@ -1392,7 +1392,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetVcpus",
&pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1457,7 +1457,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(cpuinfo);
VIR_FREE(cpumap);
- return(pyretval);
+ return pyretval;
cleanup:
VIR_FREE(cpuinfo);
@@ -1487,7 +1487,7 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu",
&pyobj_domain, &vcpu, &pycpumap))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1534,7 +1534,7 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"OiOi:virDomainPinVcpuFlags",
&pyobj_domain, &vcpu, &pycpumap, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1582,7 +1582,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetVcpuPinInfo",
&pyobj_domain, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1678,7 +1678,7 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
PyObject *pyobj_conn;
if (!PyArg_ParseTuple(args, (char *)"O:virConGetLastError", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1754,7 +1754,7 @@ libvirt_virRegisterErrorHandler(ATTRIBUTE_UNUSED PyObject * self,
if (!PyArg_ParseTuple
(args, (char *) "OO:xmlRegisterErrorHandler", &pyobj_f,
&pyobj_ctx))
- return (NULL);
+ return NULL;
DEBUG("libvirt_virRegisterErrorHandler(%p, %p) called\n", pyobj_ctx,
pyobj_f);
@@ -1780,7 +1780,7 @@ libvirt_virRegisterErrorHandler(ATTRIBUTE_UNUSED PyObject * self,
}
py_retval = libvirt_intWrap(1);
- return (py_retval);
+ return py_retval;
}
static int virConnectCredCallbackWrapper(virConnectCredentialPtr cred,
@@ -1874,7 +1874,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virConnectAuth auth;
if (!PyArg_ParseTuple(args, (char *)"zOi:virConnectOpenAuth", &name, &pyauth, &flags))
- return(NULL);
+ return NULL;
pycredtype = PyList_GetItem(pyauth, 0);
pycredcb = PyList_GetItem(pyauth, 1);
@@ -1899,7 +1899,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
LIBVIRT_END_ALLOW_THREADS;
VIR_FREE(auth.credtype);
py_retval = libvirt_virConnectPtrWrap((virConnectPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
@@ -1948,7 +1948,7 @@ libvirt_virConnectGetVersion (PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectGetVersion",
&pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1974,7 +1974,7 @@ libvirt_virConnectGetLibVersion (PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectGetLibVersion",
&pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1999,7 +1999,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDomains", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2029,7 +2029,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(ids);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2043,7 +2043,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedDomains", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2073,7 +2073,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2087,7 +2087,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED,
unsigned int flags;
if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainSnapshotListNames", &pyobj_dom, &flags))
- return(NULL);
+ return NULL;
dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2117,7 +2117,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2131,7 +2131,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED,
unsigned int flags;
if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainSnapshotListChildrenNames", &pyobj_snap, &flags))
- return(NULL);
+ return NULL;
snap = (virDomainSnapshotPtr) PyvirDomainSnapshot_Get(pyobj_snap);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2161,7 +2161,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2174,7 +2174,7 @@ libvirt_virDomainRevertToSnapshot(PyObject *self ATTRIBUTE_UNUSED,
unsigned int flags;
if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainRevertToSnapshot", &pyobj_dom, &pyobj_snap, &flags))
- return(NULL);
+ return NULL;
snap = (virDomainSnapshotPtr) PyvirDomainSnapshot_Get(pyobj_snap);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2195,7 +2195,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virDomainInfo info;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetInfo", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2210,7 +2210,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.nrVirtCpu));
PyList_SetItem(py_retval, 4,
libvirt_longlongWrap((unsigned long long) info.cpuTime));
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2279,7 +2279,7 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
unsigned int flags;
if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInfo", &pyobj_domain, &path, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2291,7 +2291,7 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyList_SetItem(py_retval, 0, libvirt_ulonglongWrap(info.capacity));
PyList_SetItem(py_retval, 1, libvirt_ulonglongWrap(info.allocation));
PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.physical));
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2303,7 +2303,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virNodeInfo info;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetInfo", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2320,7 +2320,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyList_SetItem(py_retval, 5, libvirt_intWrap((int) info.sockets));
PyList_SetItem(py_retval, 6, libvirt_intWrap((int) info.cores));
PyList_SetItem(py_retval, 7, libvirt_intWrap((int) info.threads));
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2332,7 +2332,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetUUID", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
if (domain == NULL)
@@ -2345,7 +2345,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return VIR_PY_NONE;
py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2359,7 +2359,7 @@ libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetUUIDString",
&pyobj_dom))
- return(NULL);
+ return NULL;
dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom);
if (dom == NULL)
@@ -2372,7 +2372,7 @@ libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString((char *) &uuidstr[0]);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2385,7 +2385,7 @@ libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int len;
if (!PyArg_ParseTuple(args, (char *)"Oz#:virDomainLookupByUUID", &pyobj_conn, &uuid, &len))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if ((uuid == NULL) || (len != VIR_UUID_BUFLEN))
@@ -2395,7 +2395,7 @@ libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
c_retval = virDomainLookupByUUID(conn, uuid);
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_virDomainPtrWrap((virDomainPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
@@ -2410,7 +2410,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListNetworks", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2440,7 +2440,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -2455,7 +2455,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedNetworks", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2485,7 +2485,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -2498,7 +2498,7 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virNetworkGetUUID", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virNetworkPtr) PyvirNetwork_Get(pyobj_domain);
if (domain == NULL)
@@ -2511,7 +2511,7 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return VIR_PY_NONE;
py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2525,7 +2525,7 @@ libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virNetworkGetUUIDString",
&pyobj_net))
- return(NULL);
+ return NULL;
net = (virNetworkPtr) PyvirNetwork_Get(pyobj_net);
if (net == NULL)
@@ -2538,7 +2538,7 @@ libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString((char *) &uuidstr[0]);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2551,7 +2551,7 @@ libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
int len;
if (!PyArg_ParseTuple(args, (char *)"Oz#:virNetworkLookupByUUID", &pyobj_conn, &uuid, &len))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if ((uuid == NULL) || (len != VIR_UUID_BUFLEN))
@@ -2561,7 +2561,7 @@ libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
c_retval = virNetworkLookupByUUID(conn, uuid);
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_virNetworkPtrWrap((virNetworkPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
@@ -2573,7 +2573,7 @@ libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyObject *pyobj_domain;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetAutostart", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
@@ -2584,7 +2584,7 @@ libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
if (c_retval < 0)
return VIR_PY_INT_FAIL;
py_retval = libvirt_intWrap(autostart);
- return(py_retval);
+ return py_retval;
}
@@ -2596,7 +2596,7 @@ libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
PyObject *pyobj_network;
if (!PyArg_ParseTuple(args, (char *)"O:virNetworkGetAutostart", &pyobj_network))
- return(NULL);
+ return NULL;
network = (virNetworkPtr) PyvirNetwork_Get(pyobj_network);
@@ -2607,7 +2607,7 @@ libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
if (c_retval < 0)
return VIR_PY_INT_FAIL;
py_retval = libvirt_intWrap(autostart);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2620,7 +2620,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
unsigned long long *freeMems;
if (!PyArg_ParseTuple(args, (char *)"Oii:virNodeGetCellsFreeMemory", &pyobj_conn, &startCell, &maxCells))
- return(NULL);
+ return NULL;
if ((startCell < 0) || (maxCells <= 0) || (startCell + maxCells > 10000))
return VIR_PY_NONE;
@@ -2643,7 +2643,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
libvirt_longlongWrap((long long) freeMems[i]));
}
VIR_FREE(freeMems);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2783,7 +2783,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListStoragePools", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2821,7 +2821,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -2836,7 +2836,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedStoragePools", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2874,7 +2874,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -2889,7 +2889,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolListVolumes", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2927,7 +2927,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2938,7 +2938,7 @@ libvirt_virStoragePoolGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
PyObject *pyobj_pool;
if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolGetAutostart", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
@@ -2950,7 +2950,7 @@ libvirt_virStoragePoolGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
return VIR_PY_NONE;
py_retval = libvirt_intWrap(autostart);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -2962,7 +2962,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virStoragePoolInfo info;
if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolGetInfo", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2981,7 +2981,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
libvirt_longlongWrap((unsigned long long) info.allocation));
PyList_SetItem(py_retval, 3,
libvirt_longlongWrap((unsigned long long) info.available));
- return(py_retval);
+ return py_retval;
}
@@ -2994,7 +2994,7 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virStorageVolInfo info;
if (!PyArg_ParseTuple(args, (char *)"O:virStorageVolGetInfo", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStorageVolPtr) PyvirStorageVol_Get(pyobj_pool);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3010,7 +3010,7 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
libvirt_longlongWrap((unsigned long long) info.capacity));
PyList_SetItem(py_retval, 2,
libvirt_longlongWrap((unsigned long long) info.allocation));
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3022,7 +3022,7 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolGetUUID", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
if (pool == NULL)
@@ -3036,7 +3036,7 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3049,7 +3049,7 @@ libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolGetUUIDString", &pyobj_pool))
- return(NULL);
+ return NULL;
pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
if (pool == NULL)
@@ -3062,7 +3062,7 @@ libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString((char *) &uuidstr[0]);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3075,7 +3075,7 @@ libvirt_virStoragePoolLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
int len;
if (!PyArg_ParseTuple(args, (char *)"Oz#:virStoragePoolLookupByUUID", &pyobj_conn, &uuid, &len))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if ((uuid == NULL) || (len != VIR_UUID_BUFLEN))
@@ -3085,7 +3085,7 @@ libvirt_virStoragePoolLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
c_retval = virStoragePoolLookupByUUID(conn, uuid);
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_virStoragePoolPtrWrap((virStoragePoolPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3101,7 +3101,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"Ozi:virNodeListDevices",
&pyobj_conn, &cap, &flags))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3131,7 +3131,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3144,7 +3144,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
PyObject *pyobj_dev;
if (!PyArg_ParseTuple(args, (char *)"O:virNodeDeviceListCaps", &pyobj_dev))
- return(NULL);
+ return NULL;
dev = (virNodeDevicePtr) PyvirNodeDevice_Get(pyobj_dev);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3174,7 +3174,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3186,7 +3186,7 @@ libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virSecretGetUUID", &pyobj_secret))
- return(NULL);
+ return NULL;
secret = (virSecretPtr) PyvirSecret_Get(pyobj_secret);
if (secret == NULL)
@@ -3199,7 +3199,7 @@ libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return VIR_PY_NONE;
py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3213,7 +3213,7 @@ libvirt_virSecretGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virSecretGetUUIDString",
&pyobj_dom))
- return(NULL);
+ return NULL;
dom = (virSecretPtr) PyvirSecret_Get(pyobj_dom);
if (dom == NULL)
@@ -3226,7 +3226,7 @@ libvirt_virSecretGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString((char *) &uuidstr[0]);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3239,7 +3239,7 @@ libvirt_virSecretLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int len;
if (!PyArg_ParseTuple(args, (char *)"Oz#:virSecretLookupByUUID", &pyobj_conn, &uuid, &len))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if ((uuid == NULL) || (len != VIR_UUID_BUFLEN))
@@ -3249,7 +3249,7 @@ libvirt_virSecretLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
c_retval = virSecretLookupByUUID(conn, uuid);
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_virSecretPtrWrap((virSecretPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
@@ -3358,7 +3358,7 @@ libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
int c_retval;
if (!PyArg_ParseTuple(args, (char *)"O:virNWFilterGetUUID", &pyobj_nwfilter))
- return(NULL);
+ return NULL;
nwfilter = (virNWFilterPtr) PyvirNWFilter_Get(pyobj_nwfilter);
if (nwfilter == NULL)
@@ -3371,7 +3371,7 @@ libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return VIR_PY_NONE;
py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3385,7 +3385,7 @@ libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virNWFilterGetUUIDString",
&pyobj_nwfilter))
- return(NULL);
+ return NULL;
nwfilter = (virNWFilterPtr) PyvirNWFilter_Get(pyobj_nwfilter);
if (nwfilter == NULL)
@@ -3398,7 +3398,7 @@ libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString((char *) &uuidstr[0]);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3411,7 +3411,7 @@ libvirt_virNWFilterLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
int len;
if (!PyArg_ParseTuple(args, (char *)"Oz#:virNWFilterLookupByUUID", &pyobj_conn, &uuid, &len))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if ((uuid == NULL) || (len != VIR_UUID_BUFLEN))
@@ -3421,7 +3421,7 @@ libvirt_virNWFilterLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
c_retval = virNWFilterLookupByUUID(conn, uuid);
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_virNWFilterPtrWrap((virNWFilterPtr) c_retval);
- return(py_retval);
+ return py_retval;
}
@@ -3479,7 +3479,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListInterfaces", &pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3517,7 +3517,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -3533,7 +3533,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedInterfaces",
&pyobj_conn))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3571,7 +3571,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
VIR_FREE(names);
}
- return(py_retval);
+ return py_retval;
}
@@ -3589,7 +3589,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"OOi:virConnectBaselineCPU",
&pyobj_conn, &list, &flags))
- return(NULL);
+ return NULL;
conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
if (PyList_Check(list)) {
@@ -3636,7 +3636,7 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
virDomainJobInfo info;
if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetJobInfo", &pyobj_domain))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3658,7 +3658,7 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyList_SetItem(py_retval, 10, libvirt_ulonglongWrap(info.fileProcessed));
PyList_SetItem(py_retval, 11, libvirt_ulonglongWrap(info.fileRemaining));
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -3675,7 +3675,7 @@ libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetBlockJobInfo",
&pyobj_domain, &path, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -4073,7 +4073,7 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject * self,
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_intWrap(ret);
- return (py_retval);
+ return py_retval;
}
static PyObject *
@@ -4090,7 +4090,7 @@ libvirt_virConnectDomainEventDeregister(ATTRIBUTE_UNUSED PyObject * self,
if (!PyArg_ParseTuple
(args, (char *) "OO:virConnectDomainEventDeregister",
&pyobj_conn, &pyobj_conn_inst))
- return (NULL);
+ return NULL;
DEBUG("libvirt_virConnectDomainEventDeregister(%p) called\n", pyobj_conn);
@@ -4104,7 +4104,7 @@ libvirt_virConnectDomainEventDeregister(ATTRIBUTE_UNUSED PyObject * self,
Py_DECREF(pyobj_conn_inst);
py_retval = libvirt_intWrap(ret);
- return (py_retval);
+ return py_retval;
}
/*******************************************
@@ -5334,7 +5334,7 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self,
}
py_retval = libvirt_intWrap(ret);
- return (py_retval);
+ return py_retval;
}
static PyObject *
@@ -5350,7 +5350,7 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self,
if (!PyArg_ParseTuple
(args, (char *) "Oi:virConnectDomainEventDeregister",
&pyobj_conn, &callbackID))
- return (NULL);
+ return NULL;
DEBUG("libvirt_virConnectDomainEventDeregister(%p) called\n", pyobj_conn);
@@ -5362,7 +5362,7 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self,
LIBVIRT_END_ALLOW_THREADS;
py_retval = libvirt_intWrap(ret);
- return (py_retval);
+ return py_retval;
}
static void
@@ -5567,7 +5567,7 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainMigrateGetMaxSpeed",
&pyobj_domain, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
@@ -5578,7 +5578,7 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
if (c_retval < 0)
return VIR_PY_INT_FAIL;
py_retval = libvirt_ulongWrap(bandwidth);
- return(py_retval);
+ return py_retval;
}
static PyObject *
@@ -5596,7 +5596,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"OzLni:virDomainBlockPeek", &pyobj_domain,
&disk, &offset, &size, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
@@ -5631,7 +5631,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"OLni:virDomainMemoryPeek", &pyobj_domain,
&start, &size, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c
index c220af1..e532416 100644
--- a/libvirt-qemu-override.c
+++ b/libvirt-qemu-override.c
@@ -66,7 +66,7 @@ libvirt_qemu_virDomainQemuMonitorCommand(PyObject *self ATTRIBUTE_UNUSED,
if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainQemuMonitorCommand",
&pyobj_domain, &cmd, &flags))
- return(NULL);
+ return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
if (domain == NULL)
@@ -79,7 +79,7 @@ libvirt_qemu_virDomainQemuMonitorCommand(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyString_FromString(result);
- return(py_retval);
+ return py_retval;
}
/************************************************************************
diff --git a/typewrappers.c b/typewrappers.c
index 3f200b3..b547cad 100644
--- a/typewrappers.c
+++ b/typewrappers.c
@@ -43,7 +43,7 @@ libvirt_intWrap(int val)
{
PyObject *ret;
ret = PyInt_FromLong((long) val);
- return (ret);
+ return ret;
}
PyObject *
@@ -51,7 +51,7 @@ libvirt_longWrap(long val)
{
PyObject *ret;
ret = PyInt_FromLong(val);
- return (ret);
+ return ret;
}
PyObject *
@@ -59,7 +59,7 @@ libvirt_ulongWrap(unsigned long val)
{
PyObject *ret;
ret = PyLong_FromLong(val);
- return (ret);
+ return ret;
}
PyObject *
@@ -67,7 +67,7 @@ libvirt_longlongWrap(long long val)
{
PyObject *ret;
ret = PyLong_FromUnsignedLongLong((unsigned long long) val);
- return (ret);
+ return ret;
}
PyObject *
@@ -75,7 +75,7 @@ libvirt_ulonglongWrap(unsigned long long val)
{
PyObject *ret;
ret = PyLong_FromUnsignedLongLong(val);
- return (ret);
+ return ret;
}
PyObject *
@@ -85,11 +85,11 @@ libvirt_charPtrSizeWrap(char *str, Py_ssize_t size)
if (str == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = PyString_FromStringAndSize(str, size);
VIR_FREE(str);
- return (ret);
+ return ret;
}
PyObject *
@@ -99,11 +99,11 @@ libvirt_charPtrWrap(char *str)
if (str == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = PyString_FromString(str);
VIR_FREE(str);
- return (ret);
+ return ret;
}
PyObject *
@@ -113,10 +113,10 @@ libvirt_constcharPtrWrap(const char *str)
if (str == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = PyString_FromString(str);
- return (ret);
+ return ret;
}
PyObject *
@@ -126,11 +126,11 @@ libvirt_virDomainPtrWrap(virDomainPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virDomainPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -140,11 +140,11 @@ libvirt_virNetworkPtrWrap(virNetworkPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virNetworkPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -154,11 +154,11 @@ libvirt_virInterfacePtrWrap(virInterfacePtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virInterfacePtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -168,11 +168,11 @@ libvirt_virStoragePoolPtrWrap(virStoragePoolPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virStoragePoolPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -182,11 +182,11 @@ libvirt_virStorageVolPtrWrap(virStorageVolPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virStorageVolPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -196,11 +196,11 @@ libvirt_virConnectPtrWrap(virConnectPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virConnectPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -210,11 +210,11 @@ libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virNodeDevicePtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -228,7 +228,7 @@ libvirt_virSecretPtrWrap(virSecretPtr node)
}
ret = libvirt_buildPyObject(node, "virSecretPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -242,7 +242,7 @@ libvirt_virNWFilterPtrWrap(virNWFilterPtr node)
}
ret = libvirt_buildPyObject(node, "virNWFilterPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -256,7 +256,7 @@ libvirt_virStreamPtrWrap(virStreamPtr node)
}
ret = libvirt_buildPyObject(node, "virStreamPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -266,11 +266,11 @@ libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virDomainSnapshotPtr", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -281,11 +281,11 @@ libvirt_virEventHandleCallbackWrap(virEventHandleCallback node)
if (node == NULL) {
Py_INCREF(Py_None);
printf("%s: WARNING - Wrapping None\n", __func__);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virEventHandleCallback", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -296,11 +296,11 @@ libvirt_virEventTimeoutCallbackWrap(virEventTimeoutCallback node)
if (node == NULL) {
printf("%s: WARNING - Wrapping None\n", __func__);
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virEventTimeoutCallback", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -310,11 +310,11 @@ libvirt_virFreeCallbackWrap(virFreeCallback node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "virFreeCallback", NULL);
- return (ret);
+ return ret;
}
PyObject *
@@ -324,9 +324,9 @@ libvirt_virVoidPtrWrap(void* node)
if (node == NULL) {
Py_INCREF(Py_None);
- return (Py_None);
+ return Py_None;
}
ret = libvirt_buildPyObject(node, "void*", NULL);
- return (ret);
+ return ret;
}
generated by cgit (git 2.34.1) at 2026-04-04 16:24:38 +0000
an class="hl opt">)) != 0) { gf_log ("resolver", GF_LOG_ERROR, "getaddrinfo failed (%s)", gai_strerror (ret)); GF_FREE (*dnscache); *dnscache = NULL; GF_FREE (port_str); return -1; } GF_FREE (port_str); cache->next = cache->first; } if (cache->next) { ret = getnameinfo((struct sockaddr *)cache->next->ai_addr, cache->next->ai_addrlen, host, sizeof (host), service, sizeof (service), NI_NUMERICHOST); if (ret != 0) { gf_log ("resolver", GF_LOG_ERROR, "getnameinfo failed (%s)", gai_strerror (ret)); goto err; } gf_log ("resolver", GF_LOG_DEBUG, "returning ip-%s (port-%s) for hostname: %s and port: %d", host, service, hostname, port); *addr_info = cache->next; } if (cache->next) cache->next = cache->next->ai_next; if (cache->next) { ret = getnameinfo((struct sockaddr *)cache->next->ai_addr, cache->next->ai_addrlen, host, sizeof (host), service, sizeof (service), NI_NUMERICHOST); if (ret != 0) { gf_log ("resolver", GF_LOG_ERROR, "getnameinfo failed (%s)", gai_strerror (ret)); goto err; } gf_log ("resolver", GF_LOG_DEBUG, "next DNS query will return: ip-%s port-%s", host, service); } return 0; err: freeaddrinfo (cache->first); cache->first = cache->next = NULL; GF_FREE (cache); *dnscache = NULL; return -1; } void gf_log_volume_file (FILE *specfp) { extern FILE *gf_log_logfile; int lcount = 0; char data[GF_UNIT_KB]; fseek (specfp, 0L, SEEK_SET); fprintf (gf_log_logfile, "Given volfile:\n"); fprintf (gf_log_logfile, "+---------------------------------------" "---------------------------------------+\n"); while (fgets (data, GF_UNIT_KB, specfp) != NULL){ lcount++; fprintf (gf_log_logfile, "%3d: %s", lcount, data); } fprintf (gf_log_logfile, "\n+---------------------------------------" "---------------------------------------+\n"); fflush (gf_log_logfile); fseek (specfp, 0L, SEEK_SET); } static void gf_dump_config_flags (int fd) { int ret = 0; ret = write (fd, "configuration details:\n", 23); if (ret == -1) goto out; /* have argp */ #ifdef HAVE_ARGP ret = write (fd, "argp 1\n", 7); if (ret == -1) goto out; #endif /* ifdef if found backtrace */ #ifdef HAVE_BACKTRACE ret = write (fd, "backtrace 1\n", 12); if (ret == -1) goto out; #endif /* Berkeley-DB version has cursor->get() */ #ifdef HAVE_BDB_CURSOR_GET ret = write (fd, "bdb->cursor->get 1\n", 19); if (ret == -1) goto out; #endif /* Define to 1 if you have the <db.h> header file. */ #ifdef HAVE_DB_H ret = write (fd, "db.h 1\n", 7); if (ret == -1) goto out; #endif /* Define to 1 if you have the <dlfcn.h> header file. */ #ifdef HAVE_DLFCN_H ret = write (fd, "dlfcn 1\n", 8); if (ret == -1) goto out; #endif /* define if fdatasync exists */ #ifdef HAVE_FDATASYNC ret = write (fd, "fdatasync 1\n", 12); if (ret == -1) goto out; #endif /* Define to 1 if you have the `pthread' library (-lpthread). */ #ifdef HAVE_LIBPTHREAD ret = write (fd, "libpthread 1\n", 13); if (ret == -1) goto out; #endif /* define if llistxattr exists */ #ifdef HAVE_LLISTXATTR ret = write (fd, "llistxattr 1\n", 13); if (ret == -1) goto out; #endif /* define if found setfsuid setfsgid */ #ifdef HAVE_SET_FSID ret = write (fd, "setfsid 1\n", 10); if (ret == -1) goto out; #endif /* define if found spinlock */ #ifdef HAVE_SPINLOCK ret = write (fd, "spinlock 1\n", 11); if (ret == -1) goto out; #endif /* Define to 1 if you have the <sys/epoll.h> header file. */ #ifdef HAVE_SYS_EPOLL_H ret = write (fd, "epoll.h 1\n", 10); if (ret == -1) goto out; #endif /* Define to 1 if you have the <sys/extattr.h> header file. */ #ifdef HAVE_SYS_EXTATTR_H ret = write (fd, "extattr.h 1\n", 12); if (ret == -1) goto out; #endif /* Define to 1 if you have the <sys/xattr.h> header file. */ #ifdef HAVE_SYS_XATTR_H ret = write (fd, "xattr.h 1\n", 10); if (ret == -1) goto out; #endif /* define if found st_atim.tv_nsec */ #ifdef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC ret = write (fd, "st_atim.tv_nsec 1\n", 18); if (ret == -1) goto out; #endif /* define if found st_atimespec.tv_nsec */ #ifdef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC ret = write (fd, "st_atimespec.tv_nsec 1\n",23); if (ret == -1) goto out; #endif /* Define to the full name and version of this package. */ #ifdef PACKAGE_STRING { char msg[128]; sprintf (msg, "package-string: %s\n", PACKAGE_STRING); ret = write (fd, msg, strlen (msg)); if (ret == -1) goto out; } #endif out: return; } /* Obtain a backtrace and print it to stdout. */ /* TODO: It looks like backtrace_symbols allocates memory, it may be problem because mostly memory allocation/free causes 'sigsegv' */ void gf_print_trace (int32_t signum) { extern FILE *gf_log_logfile; struct tm *tm = NULL; char msg[1024] = {0,}; char timestr[256] = {0,}; time_t utime = 0; int ret = 0; int fd = 0; fd = fileno (gf_log_logfile); /* Pending frames, (if any), list them in order */ ret = write (fd, "pending frames:\n", 16); { glusterfs_ctx_t *ctx = glusterfs_ctx_get (); struct list_head *trav = ((call_pool_t *)ctx->pool)->all_frames.next; while (trav != (&((call_pool_t *)ctx->pool)->all_frames)) { call_frame_t *tmp = (call_frame_t *)(&((call_stack_t *)trav)->frames); if (tmp->root->type == GF_OP_TYPE_FOP) sprintf (msg,"frame : type(%d) op(%s)\n", tmp->root->type, gf_fop_list[tmp->root->op]); if (tmp->root->type == GF_OP_TYPE_MGMT) sprintf (msg,"frame : type(%d) op(%s)\n", tmp->root->type, gf_mgmt_list[tmp->root->op]); ret = write (fd, msg, strlen (msg)); trav = trav->next; } ret = write (fd, "\n", 1); } sprintf (msg, "patchset: %s\n", GLUSTERFS_REPOSITORY_REVISION); ret = write (fd, msg, strlen (msg)); sprintf (msg, "signal received: %d\n", signum); ret = write (fd, msg, strlen (msg)); { /* Dump the timestamp of the crash too, so the previous logs can be related */ utime = time (NULL); tm = localtime (&utime); strftime (timestr, 256, "%Y-%m-%d %H:%M:%S\n", tm); ret = write (fd, "time of crash: ", 15); ret = write (fd, timestr, strlen (timestr)); } gf_dump_config_flags (fd); #if HAVE_BACKTRACE /* Print 'backtrace' */ { void *array[200]; size_t size; size = backtrace (array, 200); backtrace_symbols_fd (&array[1], size-1, fd); sprintf (msg, "---------\n"); ret = write (fd, msg, strlen (msg)); } #endif /* HAVE_BACKTRACE */ /* Send a signal to terminate the process */ signal (signum, SIG_DFL); raise (signum); } void trap (void) { } char * gf_trim (char *string) { register char *s, *t; if (string == NULL) { return NULL; } for (s = string; isspace (*s); s++) ; if (*s == 0) return s; t = s + strlen (s) - 1; while (t > s && isspace (*t)) t--; *++t = '\0'; return s; } int gf_strsplit (const char *str, const char *delim, char ***tokens, int *token_count) { char *_running = NULL; char *running = NULL; char *token = NULL; char **token_list = NULL; int count = 0; int i = 0; int j = 0; if (str == NULL || delim == NULL || tokens == NULL || token_count == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); return -1; } _running = gf_strdup (str); if (_running == NULL) { return -1; } running = _running; while ((token = strsep (&running, delim)) != NULL) { if (token[0] != '\0') count++; } GF_FREE (_running); _running = gf_strdup (str); if (_running == NULL) { return -1; } running = _running; if ((token_list = GF_CALLOC (count, sizeof (char *), gf_common_mt_char)) == NULL) { GF_FREE (_running); return -1; } while ((token = strsep (&running, delim)) != NULL) { if (token[0] == '\0') continue; token_list[i] = gf_strdup (token); if (token_list[i] == NULL) goto free_exit; i++; } GF_FREE (_running); *tokens = token_list; *token_count = count; return 0; free_exit: GF_FREE (_running); for (j = 0; j < i; j++) { GF_FREE (token_list[j]); } GF_FREE (token_list); return -1; } int gf_strstr (const char *str, const char *delim, const char *match) { char *tmp = NULL; char *save_ptr = NULL; char *tmp_str = NULL; int ret = 0; tmp_str = strdup (str); if (str == NULL || delim == NULL || match == NULL || tmp_str == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); ret = -1; goto out; } tmp = strtok_r (tmp_str, delim, &save_ptr); while (tmp) { ret = strcmp (tmp, match); if (ret == 0) break; tmp = strtok_r (NULL, delim, &save_ptr); } out: if (tmp_str) free (tmp_str); return ret; } int gf_volume_name_validate (const char *volume_name) { const char *vname = NULL; if (volume_name == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); return -1; } if (!isalpha (volume_name[0])) { return 1; } for (vname = &volume_name[1]; *vname != '\0'; vname++) { if (!(isalnum (*vname) || *vname == '_')) return 1; } return 0; } int gf_string2time (const char *str, uint32_t *n) { unsigned long value = 0; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { return -1; } break; } old_errno = errno; errno = 0; value = strtol (str, &tail, 0); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (!((tail[0] == '\0') || ((tail[0] == 's') && (tail[1] == '\0')) || ((tail[0] == 's') && (tail[1] == 'e') && (tail[2] == 'c') && (tail[3] == '\0')))) { return -1; } *n = value; return 0; } int gf_string2percent (const char *str, uint32_t *n) { unsigned long value = 0; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { return -1; } break; } old_errno = errno; errno = 0; value = strtol (str, &tail, 0); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (!((tail[0] == '\0') || ((tail[0] == '%') && (tail[1] == '\0')))) { return -1; } *n = value; return 0; } static int _gf_string2long (const char *str, long *n, int base) { long value = 0; char *tail = NULL; int old_errno = 0; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } old_errno = errno; errno = 0; value = strtol (str, &tail, base); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { /* bala: invalid integer format */ return -1; } *n = value; return 0; } static int _gf_string2ulong (const char *str, unsigned long *n, int base) { unsigned long value = 0; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { /* bala: we do not support suffixed (-) sign and invalid integer format */ return -1; } break; } old_errno = errno; errno = 0; value = strtoul (str, &tail, base); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { /* bala: invalid integer format */ return -1; } *n = value; return 0; } static int _gf_string2uint (const char *str, unsigned int *n, int base) { unsigned long value = 0; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { /* bala: we do not support suffixed (-) sign and invalid integer format */ return -1; } break; } old_errno = errno; errno = 0; value = strtoul (str, &tail, base); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { /* bala: invalid integer format */ return -1; } *n = (unsigned int)value; return 0; } static int _gf_string2double (const char *str, double *n) { double value = 0.0; char *tail = NULL; int old_errno = 0; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } old_errno = errno; errno = 0; value = strtod (str, &tail); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { return -1; } *n = value; return 0; } static int _gf_string2longlong (const char *str, long long *n, int base) { long long value = 0; char *tail = NULL; int old_errno = 0; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } old_errno = errno; errno = 0; value = strtoll (str, &tail, base); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { /* bala: invalid integer format */ return -1; } *n = value; return 0; } static int _gf_string2ulonglong (const char *str, unsigned long long *n, int base) { unsigned long long value = 0; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { /* bala: we do not support suffixed (-) sign and invalid integer format */ return -1; } break; } old_errno = errno; errno = 0; value = strtoull (str, &tail, base); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { /* bala: invalid integer format */ return -1; } *n = value; return 0; } int gf_string2long (const char *str, long *n) { return _gf_string2long (str, n, 0); } int gf_string2ulong (const char *str, unsigned long *n) { return _gf_string2ulong (str, n, 0); } int gf_string2int (const char *str, int *n) { long l = 0; int ret = 0; ret = _gf_string2long (str, &l, 0); *n = l; return ret; } int gf_string2uint (const char *str, unsigned int *n) { return _gf_string2uint (str, n, 0); } int gf_string2double (const char *str, double *n) { return _gf_string2double (str, n); } int gf_string2longlong (const char *str, long long *n) { return _gf_string2longlong (str, n, 0); } int gf_string2ulonglong (const char *str, unsigned long long *n) { return _gf_string2ulonglong (str, n, 0); } int gf_string2int8 (const char *str, int8_t *n) { long l = 0L; int rv = 0; rv = _gf_string2long (str, &l, 0); if (rv != 0) return rv; if (l >= INT8_MIN && l <= INT8_MAX) { *n = (int8_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2int16 (const char *str, int16_t *n) { long l = 0L; int rv = 0; rv = _gf_string2long (str, &l, 0); if (rv != 0) return rv; if (l >= INT16_MIN && l <= INT16_MAX) { *n = (int16_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2int32 (const char *str, int32_t *n) { long l = 0L; int rv = 0; rv = _gf_string2long (str, &l, 0); if (rv != 0) return rv; if (l >= INT32_MIN && l <= INT32_MAX) { *n = (int32_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2int64 (const char *str, int64_t *n) { long long l = 0LL; int rv = 0; rv = _gf_string2longlong (str, &l, 0); if (rv != 0) return rv; if (l >= INT64_MIN && l <= INT64_MAX) { *n = (int64_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint8 (const char *str, uint8_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 0); if (rv != 0) return rv; if (l >= 0 && l <= UINT8_MAX) { *n = (uint8_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint16 (const char *str, uint16_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 0); if (rv != 0) return rv; if (l >= 0 && l <= UINT16_MAX) { *n = (uint16_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint32 (const char *str, uint32_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 0); if (rv != 0) return rv; if (l >= 0 && l <= UINT32_MAX) { *n = (uint32_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint64 (const char *str, uint64_t *n) { unsigned long long l = 0ULL; int rv = 0; rv = _gf_string2ulonglong (str, &l, 0); if (rv != 0) return rv; if (l >= 0 && l <= UINT64_MAX) { *n = (uint64_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2ulong_base10 (const char *str, unsigned long *n) { return _gf_string2ulong (str, n, 10); } int gf_string2uint_base10 (const char *str, unsigned int *n) { return _gf_string2uint (str, n, 10); } int gf_string2uint8_base10 (const char *str, uint8_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 10); if (rv != 0) return rv; if (l >= 0 && l <= UINT8_MAX) { *n = (uint8_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint16_base10 (const char *str, uint16_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 10); if (rv != 0) return rv; if (l >= 0 && l <= UINT16_MAX) { *n = (uint16_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint32_base10 (const char *str, uint32_t *n) { unsigned long l = 0L; int rv = 0; rv = _gf_string2ulong (str, &l, 10); if (rv != 0) return rv; if (l >= 0 && l <= UINT32_MAX) { *n = (uint32_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2uint64_base10 (const char *str, uint64_t *n) { unsigned long long l = 0ULL; int rv = 0; rv = _gf_string2ulonglong (str, &l, 10); if (rv != 0) return rv; if (l >= 0 && l <= UINT64_MAX) { *n = (uint64_t) l; return 0; } errno = ERANGE; return -1; } int gf_string2bytesize (const char *str, uint64_t *n) { uint64_t value = 0ULL; char *tail = NULL; int old_errno = 0; const char *s = NULL; if (str == NULL || n == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); errno = EINVAL; return -1; } for (s = str; *s != '\0'; s++) { if (isspace (*s)) { continue; } if (*s == '-') { /* bala: we do not support suffixed (-) sign and invalid integer format */ return -1; } break; } old_errno = errno; errno = 0; value = strtoull (str, &tail, 10); if (errno == ERANGE || errno == EINVAL) { return -1; } if (errno == 0) { errno = old_errno; } if (tail[0] != '\0') { if (strcasecmp (tail, GF_UNIT_KB_STRING) == 0) { value *= GF_UNIT_KB; } else if (strcasecmp (tail, GF_UNIT_MB_STRING) == 0) { value *= GF_UNIT_MB; } else if (strcasecmp (tail, GF_UNIT_GB_STRING) == 0) { value *= GF_UNIT_GB; } else if (strcasecmp (tail, GF_UNIT_TB_STRING) == 0) { value *= GF_UNIT_TB; } else if (strcasecmp (tail, GF_UNIT_PB_STRING) == 0) { value *= GF_UNIT_PB; } else { /* bala: invalid integer format */ return -1; } } *n = value; return 0; } int64_t gf_str_to_long_long (const char *number) { int64_t unit = 1; int64_t ret = 0; char *endptr = NULL ; if (!number) return 0; ret = strtoll (number, &endptr, 0); if (endptr) { switch (*endptr) { case 'G': case 'g': if ((* (endptr + 1) == 'B') ||(* (endptr + 1) == 'b')) unit = 1024 * 1024 * 1024; break; case 'M': case 'm': if ((* (endptr + 1) == 'B') ||(* (endptr + 1) == 'b')) unit = 1024 * 1024; break; case 'K': case 'k': if ((* (endptr + 1) == 'B') ||(* (endptr + 1) == 'b')) unit = 1024; break; case '%': unit = 1; break; default: unit = 1; break; } } return ret * unit; } int gf_string2boolean (const char *str, gf_boolean_t *b) { if (str == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); return -1; } if ((strcasecmp (str, "1") == 0) || (strcasecmp (str, "on") == 0) || (strcasecmp (str, "yes") == 0) || (strcasecmp (str, "true") == 0) || (strcasecmp (str, "enable") == 0)) { *b = _gf_true; return 0; } if ((strcasecmp (str, "0") == 0) || (strcasecmp (str, "off") == 0) || (strcasecmp (str, "no") == 0) || (strcasecmp (str, "false") == 0) || (strcasecmp (str, "disable") == 0)) { *b = _gf_false; return 0; } return -1; } int gf_lockfd (int fd) { struct gf_flock fl; fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; fl.l_start = 0; fl.l_len = 0; return fcntl (fd, F_SETLK, &fl); } int gf_unlockfd (int fd) { struct gf_flock fl; fl.l_type = F_UNLCK; fl.l_whence = SEEK_SET; fl.l_start = 0; fl.l_len = 0; return fcntl (fd, F_SETLK, &fl); } static void compute_checksum (char *buf, size_t size, uint32_t *checksum) { int ret = -1; char *checksum_buf = NULL; checksum_buf = (char *)(checksum); if (!(*checksum)) { checksum_buf [0] = 0xba; checksum_buf [1] = 0xbe; checksum_buf [2] = 0xb0; checksum_buf [3] = 0x0b; } for (ret = 0; ret < (size - 4); ret += 4) { checksum_buf[0] ^= (buf[ret]); checksum_buf[1] ^= (buf[ret + 1] << 1) ; checksum_buf[2] ^= (buf[ret + 2] << 2); checksum_buf[3] ^= (buf[ret + 3] << 3); } for (ret = 0; ret <= (size % 4); ret++) { checksum_buf[ret] ^= (buf[(size - 4) + ret] << ret); } return; } #define GF_CHECKSUM_BUF_SIZE 1024 int get_checksum_for_file (int fd, uint32_t *checksum) { int ret = -1; char buf[GF_CHECKSUM_BUF_SIZE] = {0,}; /* goto first place */ lseek (fd, 0L, SEEK_SET); do { ret = read (fd, &buf, GF_CHECKSUM_BUF_SIZE); if (ret > 0) compute_checksum (buf, GF_CHECKSUM_BUF_SIZE, checksum); } while (ret > 0); /* set it back */ lseek (fd, 0L, SEEK_SET); return ret; } /* One should pass the command here with command with full path, otherwise, execv will fail */ int gf_system (const char *command) { int ret = -1; pid_t pid = 0; int status = 0; int idx = 0; char *dupcmd = NULL; char *arg = NULL; char *tmp = NULL; char *argv[100] = { NULL, }; dupcmd = gf_strdup (command); if (!dupcmd) goto out; pid = fork (); if (pid < 0) { /* failure */ goto out; } if (pid == 0) { /* Child process */ /* Step 0: Prepare the argv */ arg = strtok_r (dupcmd, " ", &tmp); while (arg) { argv[idx] = arg; arg = strtok_r (NULL, " ", &tmp); idx++; } /* Step 1: Close all 'fd' */ for (idx = 3; idx < 65536; idx++) { close (idx); } /* Step 2: execv (); */ ret = execvp (argv[0], argv); /* Code will not come here at all */ gf_log ("", GF_LOG_ERROR, "execv of (%s) failed", command); kill (getpid(), SIGKILL); } if (pid > 0) { /* Current, ie, parent process */ pid = waitpid (pid, &status, 0); if (WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS) ret = 0; else ret = -1; } out: if (dupcmd) GF_FREE (dupcmd); return ret; } int get_checksum_for_path (char *path, uint32_t *checksum) { int ret = -1; int fd = -1; GF_ASSERT (path); GF_ASSERT (checksum); fd = open (path, O_RDWR); if (fd == -1) { gf_log ("", GF_LOG_ERROR, "Unable to open %s, errno: %d", path, errno); goto out; } ret = get_checksum_for_file (fd, checksum); out: if (fd != -1) close (fd); return ret; } char * strtail (char *str, const char *pattern) { int i = 0; for (i = 0; str[i] == pattern[i] && str[i]; i++); if (pattern[i] == '\0') return str + i; return NULL; } /* RFC 1123 & 952 */ char valid_host_name (char *address, int length) { int i = 0; char ret = 1; if ((length > 75) || (length == 1)) { ret = 0; goto out; } if (!isalnum (address[length - 1])) { ret = 0; goto out; } for (i = 0; i < length; i++) { if (!isalnum (address[i]) && (address[i] != '.') && (address[i] != '-')) { ret = 0; goto out; } } out: return ret; } char valid_ipv4_address (char *address, int length) { int octets = 0; int value = 0; char *tmp = NULL, *ptr = NULL, *prev = NULL, *endptr = NULL; char ret = 1; tmp = gf_strdup (address); prev = tmp; prev = strtok_r (tmp, ".", &ptr); while (prev != NULL) { octets++; value = strtol (prev, &endptr, 10); if ((value > 255) || (value < 0) || (endptr != NULL)) { ret = 0; goto out; } prev = strtok_r (NULL, ".", &ptr); } if (octets != 4) { ret = 0; } out: GF_FREE (tmp); return ret; } char valid_ipv6_address (char *address, int length) { int hex_numbers = 0; int value = 0; char *tmp = NULL, *ptr = NULL, *prev = NULL, *endptr = NULL; char ret = 1; tmp = gf_strdup (address); prev = strtok_r (tmp, ":", &ptr); while (prev != NULL) { hex_numbers++; value = strtol (prev, &endptr, 16); if ((value > 0xffff) || (value < 0) || (endptr != NULL && *endptr != '\0')) { ret = 0; goto out; } prev = strtok_r (NULL, ":", &ptr); } if (hex_numbers > 8) { ret = 0; } out: GF_FREE (tmp); return ret; } char valid_internet_address (char *address) { char ret = 0; int length = 0; if (address == NULL) { gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid"); goto out; } length = strlen (address); if (length == 0) { goto out; } if (valid_ipv4_address (address, length) || valid_ipv6_address (address, length) || valid_host_name (address, length)) { ret = 1; } out: return ret; }