projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1455 from rubenk/configure-ac-remove-dead-code
[collectd.git]
/
src
/
pyconfig.c
diff --git
a/src/pyconfig.c
b/src/pyconfig.c
index
53e80e4
..
b5c01aa
100644
(file)
--- a/
src/pyconfig.c
+++ b/
src/pyconfig.c
@@
-125,20
+125,21
@@
static PyObject *Config_repr(PyObject *s) {
/* This is ok because we have the GIL, so this is thread-save by default. */
if (node_prefix == NULL)
/* This is ok because we have the GIL, so this is thread-save by default. */
if (node_prefix == NULL)
- node_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config node
'
");
+ node_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config node ");
if (root_prefix == NULL)
if (root_prefix == NULL)
- root_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config root node
'
");
+ root_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config root node ");
if (ending == NULL)
if (ending == NULL)
- ending = cpy_string_to_unicode_or_bytes("
'
>");
+ ending = cpy_string_to_unicode_or_bytes(">");
if (node_prefix == NULL || root_prefix == NULL || ending == NULL)
return NULL;
ret = PyObject_Str(self->key);
if (node_prefix == NULL || root_prefix == NULL || ending == NULL)
return NULL;
ret = PyObject_Str(self->key);
+ CPY_SUBSTITUTE(PyObject_Repr, ret, ret);
if (self->parent == NULL || self->parent == Py_None)
if (self->parent == NULL || self->parent == Py_None)
- CPY_S
UBSTITUTE(CPY_STRCAT, ret, root_prefix, ret
);
+ CPY_S
TRCAT(&ret, root_prefix
);
else
else
- CPY_S
UBSTITUTE(CPY_STRCAT, ret, node_prefix, ret
);
- CPY_S
UBSTITUTE(CPY_STRCAT, ret,
ret, ending);
+ CPY_S
TRCAT(&ret, node_prefix
);
+ CPY_S
TRCAT(&
ret, ending);
return ret;
}
return ret;
}