Use HW_ERROR instead of -1

This commit is contained in:
Michael Droettboom 2018-12-27 14:35:23 -05:00
parent d4c92a5d68
commit e3f93470c9
1 changed files with 6 additions and 6 deletions

View File

@ -324,7 +324,7 @@ _python2js_buffer_to_typed_array(Py_buffer* buff)
case '>': case '>':
case '!': case '!':
// This path can't handle byte-swapping // This path can't handle byte-swapping
return -1; return HW_ERROR;
case '=': case '=':
case '<': case '<':
case '@': case '@':
@ -342,7 +342,7 @@ _python2js_buffer_to_typed_array(Py_buffer* buff)
case 'B': case 'B':
return hiwire_uint8array((int)buff->buf, buff->len); return hiwire_uint8array((int)buff->buf, buff->len);
case '?': case '?':
return -1; return HW_ERROR;
case 'h': case 'h':
return hiwire_int16array((int)buff->buf, buff->len); return hiwire_int16array((int)buff->buf, buff->len);
case 'H': case 'H':
@ -357,13 +357,13 @@ _python2js_buffer_to_typed_array(Py_buffer* buff)
return hiwire_uint32array((int)buff->buf, buff->len); return hiwire_uint32array((int)buff->buf, buff->len);
case 'q': case 'q':
case 'Q': case 'Q':
return -1; return HW_ERROR;
case 'f': case 'f':
return hiwire_float32array((int)buff->buf, buff->len); return hiwire_float32array((int)buff->buf, buff->len);
case 'd': case 'd':
return hiwire_float64array((int)buff->buf, buff->len); return hiwire_float64array((int)buff->buf, buff->len);
default: default:
return -1; return HW_ERROR;
} }
} }
@ -467,11 +467,11 @@ _python2js_buffer(PyObject* x)
if (shareable != NOT_SHAREABLE) { if (shareable != NOT_SHAREABLE) {
int idarr = _python2js_buffer_to_typed_array(buff); int idarr = _python2js_buffer_to_typed_array(buff);
if (idarr == -1) { if (idarr == HW_ERROR) {
PyErr_SetString( PyErr_SetString(
PyExc_TypeError, PyExc_TypeError,
"Internal error: Invalid type to convert to array buffer."); "Internal error: Invalid type to convert to array buffer.");
return -1; return HW_ERROR;
} }
result = result =