sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

librpc: Use GUID_buf_string() in python wrappers

Browse Source 
No need for the talloc'ed strings

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2021-04-16 09:15:43 +02:00 committed by Jeremy Allison
parent ebea5639cf
commit d298623c85
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source4/librpc/ndr/py_misc.c
View File

@ -68,18 +68,17 @@ static int py_GUID_cmp(PyObject *py_self, PyObject *py_other)
static PyObject *py_GUID_str(PyObject *py_self)
{
struct GUID *self = pytalloc_get_ptr(py_self);
char *str = GUID_string(NULL, self);
PyObject *ret = PyUnicode_FromString(str);
talloc_free(str);
struct GUID_txt_buf buf;
PyObject *ret = PyUnicode_FromString(GUID_buf_string(self, &buf));
return ret;
}
static PyObject *py_GUID_repr(PyObject *py_self)
{
struct GUID *self = pytalloc_get_ptr(py_self);
char *str = GUID_string(NULL, self);
PyObject *ret = PyUnicode_FromFormat("GUID('%s')", str);
talloc_free(str);
struct GUID_txt_buf buf;
PyObject *ret = PyUnicode_FromFormat(
"GUID('%s')", GUID_buf_string(self, &buf));
return ret;
}
@ -160,18 +159,22 @@ static int py_policy_handle_init(PyObject *self, PyObject *args, PyObject *kwarg
static PyObject *py_policy_handle_repr(PyObject *py_self)
{
struct policy_handle *self = pytalloc_get_ptr(py_self);
char *uuid_str = GUID_string(NULL, &self->uuid);
PyObject *ret = PyUnicode_FromFormat("policy_handle(%d, '%s')", self->handle_type, uuid_str);
talloc_free(uuid_str);
struct GUID_txt_buf buf;
PyObject *ret = PyUnicode_FromFormat(
"policy_handle(%d, '%s')",
self->handle_type,
GUID_buf_string(&self->uuid, &buf));
return ret;
}
static PyObject *py_policy_handle_str(PyObject *py_self)
{
struct policy_handle *self = pytalloc_get_ptr(py_self);
char *uuid_str = GUID_string(NULL, &self->uuid);
PyObject *ret = PyUnicode_FromFormat("%d, %s", self->handle_type, uuid_str);
talloc_free(uuid_str);
struct GUID_txt_buf buf;
PyObject *ret = PyUnicode_FromFormat(
"%d, %s",
self->handle_type,
GUID_buf_string(&self->uuid, &buf));
return ret;
}