diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-18 10:35:55 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-10-18 10:35:55 +0100 |
| commit | 9dcc52ddb640328147d58ddf53241ad9617c57de (patch) | |
| tree | 228d2298a7a6e8786e55ae1e50ed47ec9739a856 /tools/python | |
| parent | 1d2a87666556e7c3d483ab62f9159dc36bbf6614 (diff) | |
| download | xen-9dcc52ddb640328147d58ddf53241ad9617c57de.tar.gz xen-9dcc52ddb640328147d58ddf53241ad9617c57de.tar.bz2 xen-9dcc52ddb640328147d58ddf53241ad9617c57de.zip | |
libxl: idl: use "dispose" rather than "destroy" for function to free IDL types
Destroy is an overloaded term which would commonly like to be used for actual
destructive operations, such as destroying a domain etc.
Dispose isn't a great term but it does the job.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/python')
| -rw-r--r-- | tools/python/genwrap.py | 4 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xl/xl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/python/genwrap.py b/tools/python/genwrap.py index af8d6465ff..d0c193d26f 100644 --- a/tools/python/genwrap.py +++ b/tools/python/genwrap.py @@ -100,8 +100,8 @@ def py_attrib_set(ty, f): def py_object_def(ty): l = [] - if ty.destructor_fn is not None: - dtor = ' %s(&self->obj);\n'%ty.destructor_fn + if ty.dispose_fn is not None: + dtor = ' %s(&self->obj);\n'%ty.dispose_fn else: dtor = '' diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c index b33fb94526..f8a365d09d 100644 --- a/tools/python/xen/lowlevel/xl/xl.c +++ b/tools/python/xen/lowlevel/xl/xl.c @@ -246,7 +246,7 @@ int attrib__libxl_hwcap_set(PyObject *v, libxl_hwcap *pptr) int attrib__libxl_key_value_list_set(PyObject *v, libxl_key_value_list *pptr) { if ( *pptr ) { - libxl_key_value_list_destroy(pptr); + libxl_key_value_list_dispose(pptr); *pptr = NULL; } if ( v == Py_None ) |