python: drop redundant function

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.

diff --git a/python/generator.py b/python/generator.py
index b514af5bc2ec7333f475fd3b47782b6613975145..0728519dc816d74e7b6030d6d3e5142749483c49 100755 (executable)
--- a/python/generator.py
+++ b/python/generator.py
@@ -263,7 +263,7 @@ py_types = {
     'unsigned long long':  ('l', None, "longlong", "long long"),
     'unsigned 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"),
 
     'virDomainPtr':  ('O', "virDomain", "virDomainPtr", "virDomainPtr"),

diff --git a/python/typewrappers.c b/python/typewrappers.c
index b5758b4687cf77b514d52558c04bc42514be3ec3..9021ce3796f9d9555e8bcffe2291541c719a3225 100644 (file)
--- a/python/typewrappers.c
+++ b/python/typewrappers.c
@@ -117,19 +117,6 @@ libvirt_constcharPtrWrap(const char *str)
     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 *
 libvirt_virDomainPtrWrap(virDomainPtr node)
 {

diff --git a/python/typewrappers.h b/python/typewrappers.h
index 87ea1e5cedab39d83908f6b77ab35a61bd760221..1e34dfaf3030c76a59e3580bf7997b9f37fa1d3f 100644 (file)
--- a/python/typewrappers.h
+++ b/python/typewrappers.h
@@ -1,7 +1,7 @@
 /*
  * 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>
  */
@@ -163,7 +163,6 @@ PyObject * libvirt_ulonglongWrap(unsigned long long val);
 PyObject * libvirt_charPtrWrap(char *str);
 PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size);
 PyObject * libvirt_constcharPtrWrap(const char *str);
-PyObject * libvirt_charPtrConstWrap(const char *str);
 PyObject * libvirt_virConnectPtrWrap(virConnectPtr node);
 PyObject * libvirt_virDomainPtrWrap(virDomainPtr node);
 PyObject * libvirt_virNetworkPtrWrap(virNetworkPtr node);