openstack
/
deb-python-pyeclib
Code Issues Proposed changes

Merge "Use Py_BuildValue instead of manually building dicts"

This commit is contained in:
Jenkins 2016-12-15 04:50:34 +00:00 committed by Gerrit Code Review
parent 83e91d9d83 9b8d558acc
commit a384e107fe
1 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/c/pyeclib_c/pyeclib_c.c
View File

@ -355,18 +355,6 @@ pyeclib_c_get_segment_info(PyObject *self, PyObject *args)
pyeclib_t *pyeclib_handle = NULL;
PyObject *ret_dict = NULL; /* python dictionary to return */
// Prepare variables for return dict to cleanup on exit
PyObject *segment_size_key = NULL;
PyObject *segment_size_value = NULL;
PyObject *last_segment_size_key = NULL;
PyObject *last_segment_size_value = NULL;
PyObject *fragment_size_key = NULL;
PyObject *fragment_size_value = NULL;
PyObject *last_fragment_size_key = NULL;
PyObject *last_fragment_size_value = NULL;
PyObject *num_segments_key = NULL;
PyObject *num_segments_value = NULL;
int data_len; /* data length from user in bytes */
int segment_size, last_segment_size; /* segment sizes in bytes */
int num_segments; /* total number of segments */
@ -462,42 +450,18 @@ pyeclib_c_get_segment_info(PyObject *self, PyObject *args)
fragment_size += sizeof(fragment_header_t);
/* Create and return the python dictionary of segment info */
ret_dict = PyDict_New();
ret_dict = Py_BuildValue(
"{s:i, s:i, s:i, s:i, s:i}",
"segment_size", segment_size,
"last_segment_size", last_segment_size,
"fragment_size", fragment_size,
"last_fragment_size", last_fragment_size,
"num_segments", num_segments);
if (NULL == ret_dict) {
goto error;
} else {
if((segment_size_key = PyString_FromString("segment_size\0")) == NULL ||
(segment_size_value = PyInt_FromLong(segment_size)) == NULL ||
PyDict_SetItem(ret_dict, segment_size_key, segment_size_value)) goto error;
if((last_segment_size_key = PyString_FromString("last_segment_size\0")) == NULL ||
(last_segment_size_value = PyInt_FromLong(last_segment_size)) == NULL ||
PyDict_SetItem(ret_dict, last_segment_size_key, last_segment_size_value)) goto error;
if((fragment_size_key = PyString_FromString("fragment_size\0")) == NULL ||
(fragment_size_value = PyInt_FromLong(fragment_size)) == NULL ||
PyDict_SetItem(ret_dict, fragment_size_key, fragment_size_value)) goto error;
if((last_fragment_size_key = PyString_FromString("last_fragment_size\0")) == NULL ||
(last_fragment_size_value = PyInt_FromLong(last_fragment_size)) == NULL ||
PyDict_SetItem(ret_dict, last_fragment_size_key, last_fragment_size_value)) goto error;
if((num_segments_key = PyString_FromString("num_segments\0")) == NULL ||
(num_segments_value = PyInt_FromLong(num_segments)) == NULL ||
PyDict_SetItem(ret_dict, num_segments_key, num_segments_value)) goto error;
}
exit:
Py_XDECREF(segment_size_key);
Py_XDECREF(segment_size_value);
Py_XDECREF(last_segment_size_key);
Py_XDECREF(last_segment_size_value);
Py_XDECREF(fragment_size_key);
Py_XDECREF(fragment_size_value);
Py_XDECREF(last_fragment_size_key);
Py_XDECREF(last_fragment_size_value);
Py_XDECREF(num_segments_key);
Py_XDECREF(num_segments_value);
return ret_dict;
error: