openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'xtao/multivar'

Browse Source
This commit is contained in:
J. David Ibáñez
2013-11-24 10:52:22 +01:00
parent e560a89f90 c4be96fb7c
commit b51bc45c63
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/config.c
View File

@@ -352,27 +352,27 @@ Config_get_multivar(Config *self, PyObject *args)
list = PyList_New(0); list = PyList_New(0);
err = git_config_multivar_iterator_new(&iter, self->config, name, regex); err = git_config_multivar_iterator_new(&iter, self->config, name, regex);
if (err < 0) if (err < 0)
return Error_set(err); return Error_set(err);
while ((err = git_config_next(&entry, iter)) == 0) { while ((err = git_config_next(&entry, iter)) == 0) {
PyObject *item; PyObject *item;
item = to_unicode(entry->value, NULL, NULL); item = to_unicode(entry->value, NULL, NULL);
if (item == NULL) { if (item == NULL) {
git_config_iterator_free(iter); git_config_iterator_free(iter);
return NULL; return NULL;
} }
PyList_Append(list, item); PyList_Append(list, item);
Py_CLEAR(item); Py_CLEAR(item);
} }
git_config_iterator_free(iter); git_config_iterator_free(iter);
if (err == GIT_ITEROVER) if (err == GIT_ITEROVER)
err = 0; err = 0;
if (err < 0) if (err < 0)
return Error_set(err); return Error_set(err);
return list; return list;
} }