Skip to content

Commit f198e16

Browse files
committed
Change to a single cast for arr to PyArrayObject in dbfield
1 parent 5993a6c commit f198e16

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

devsupApp/src/dbfield.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,25 @@ static int assign_array(DBADDR *paddr, PyObject *arr)
119119
void *rawfield = paddr->pfield;
120120
rset *prset;
121121
PyObject *aval;
122+
PyArrayObject * array = (PyArrayObject *)arr;
122123
unsigned elemsize = dbValueSize(paddr->field_type);
123124
unsigned long maxlen = paddr->no_elements, insize;
124125
PyArray_Descr *desc = dbf2np[paddr->field_type];
125126

126127
if(paddr->field_type==DBF_STRING &&
127-
(PyArray_NDIM((PyArrayObject *)arr) != 2 ||
128-
PyArray_DIM((PyArrayObject *)arr, 0) > (npy_intp) maxlen ||
129-
PyArray_DIM((PyArrayObject *)arr, 1) != MAX_STRING_SIZE))
128+
(PyArray_NDIM(array) != 2 ||
129+
PyArray_DIM(array, 0) > (npy_intp) maxlen ||
130+
PyArray_DIM(array, 1) != MAX_STRING_SIZE))
130131
{
131132
PyErr_Format(PyExc_ValueError, "String array has incorrect shape or is too large");
132133
return 1;
133134

134-
} else if(PyArray_NDIM((PyArrayObject *)arr) != 1 || PyArray_DIM((PyArrayObject *)arr, 0) > (npy_intp) maxlen) {
135+
} else if(PyArray_NDIM(array) != 1 || PyArray_DIM(array, 0) > (npy_intp) maxlen) {
135136
PyErr_Format(PyExc_ValueError, "Array has incorrect shape or is too large");
136137
return 1;
137138
}
138139

139-
insize = PyArray_DIM((PyArrayObject *)arr, 0);
140+
insize = PyArray_DIM(array, 0);
140141

141142
if(paddr->special==SPC_DBADDR &&
142143
(prset=dbGetRset(paddr)) &&

0 commit comments

Comments
 (0)