shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-07-27 11:41:52 +03:00
Code Issues Projects Releases Activity

python: drop redundant function

Browse Source 
I noticed some redundant code while preparing my next patch.

* python/generator.py (py_types): Fix 'const char *' mapping.
* python/typewrappers.h (libvirt_charPtrConstWrap): Drop.
* python/typewrappers.c (libvirt_charPtrConstWrap): Delete, since
it is identical to libvirt_constcharPtrWrap.
This commit is contained in:
Eric Blake
2012-02-02 16:28:26 -07:00
parent 1104c3ed21
commit 29aedfa4f4
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator.py
View File

@ -263,7 +263,7 @@ py_types = {
'unsigned long long': ('l', None, "longlong", "long long"), 'unsigned long long': ('l', None, "longlong", "long long"),
'unsigned char *': ('z', None, "charPtr", "char *"), 'unsigned char *': ('z', None, "charPtr", "char *"),
'char *': ('z', None, "charPtr", "char *"), 'char *': ('z', None, "charPtr", "char *"),
'const char *': ('z', None, "charPtrConst", "const char *"), 'const char *': ('z', None, "constcharPtr", "const char *"),
'size_t': ('n', None, "size_t", "size_t"), 'size_t': ('n', None, "size_t", "size_t"),
'virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr"), 'virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr"),

13
typewrappers.c
View File

@ -117,19 +117,6 @@ libvirt_constcharPtrWrap(const char *str)
return (ret); return (ret);
} }
PyObject *
libvirt_charPtrConstWrap(const char *str)
{
PyObject *ret;
if (str == NULL) {
Py_INCREF(Py_None);
return (Py_None);
}
ret = PyString_FromString(str);
return (ret);
}
PyObject * PyObject *
libvirt_virDomainPtrWrap(virDomainPtr node) libvirt_virDomainPtrWrap(virDomainPtr node)
{ {

3
typewrappers.h
View File

@ -1,7 +1,7 @@
/* /*
* libvirt_wrap.h: type wrappers for libvir python bindings * libvirt_wrap.h: type wrappers for libvir python bindings
* *
* Copyright (C) 2005, 2011 Red Hat, Inc. * Copyright (C) 2005, 2011-2012 Red Hat, Inc.
* *
* Daniel Veillard <veillard@redhat.com> * Daniel Veillard <veillard@redhat.com>
*/ */
@ -163,7 +163,6 @@ PyObject * libvirt_ulonglongWrap(unsigned long long val);
PyObject * libvirt_charPtrWrap(char *str); PyObject * libvirt_charPtrWrap(char *str);
PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size); PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size);
PyObject * libvirt_constcharPtrWrap(const char *str); PyObject * libvirt_constcharPtrWrap(const char *str);
PyObject * libvirt_charPtrConstWrap(const char *str);
PyObject * libvirt_virConnectPtrWrap(virConnectPtr node); PyObject * libvirt_virConnectPtrWrap(virConnectPtr node);
PyObject * libvirt_virDomainPtrWrap(virDomainPtr node); PyObject * libvirt_virDomainPtrWrap(virDomainPtr node);
PyObject * libvirt_virNetworkPtrWrap(virNetworkPtr node); PyObject * libvirt_virNetworkPtrWrap(virNetworkPtr node);