From 61e8450f25c0709a2a4fe3aa064050cf60e21e29 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 29 Aug 2006 14:39:57 +0000 Subject: [PATCH] * python/libvir.c: Pete Vetere pointed out a bug in string cast when handling errors in Python Daniel --- ChangeLog | 5 +++++ python/libvir.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5c5af06a0..844ff95ea7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 29 15:41:46 CEST 2006 Daniel Veillard + + * python/libvir.c: Pete Vetere pointed out a bug in string cast + when handling errors in Python + Sat Aug 26 16:36:15 CEST 2006 Daniel Veillard * src/sexpr.c src/sexpr.h src/xend_internal.c src/xml.c: applied diff --git a/python/libvir.c b/python/libvir.c index 17fb4a17d2..907383b03f 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -51,11 +51,11 @@ libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, virErrorPtr err) Py_XINCREF(libvirt_virPythonErrorFuncCtxt); PyTuple_SetItem(info, 0, PyInt_FromLong((long) err->code)); PyTuple_SetItem(info, 1, PyInt_FromLong((long) err->domain)); - PyTuple_SetItem(info, 2, libvirt_charPtrWrap(err->message)); + PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); PyTuple_SetItem(info, 3, PyInt_FromLong((long) err->level)); - PyTuple_SetItem(info, 4, libvirt_charPtrWrap(err->str1)); - PyTuple_SetItem(info, 5, libvirt_charPtrWrap(err->str2)); - PyTuple_SetItem(info, 6, libvirt_charPtrWrap(err->str3)); + PyTuple_SetItem(info, 4, libvirt_constcharPtrWrap(err->str1)); + PyTuple_SetItem(info, 5, libvirt_constcharPtrWrap(err->str2)); + PyTuple_SetItem(info, 6, libvirt_constcharPtrWrap(err->str3)); PyTuple_SetItem(info, 7, PyInt_FromLong((long) err->int1)); PyTuple_SetItem(info, 8, PyInt_FromLong((long) err->int2)); /* TODO pass conn and dom if available */