Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAINT Fix C compiler warnings in src/core (#2716)

This commit is contained in:
Hood Chatham 2022-06-15 12:11:34 -07:00 committed by GitHub
parent c1c0cd34fa
commit f58fadfffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/error_handling.h
View File

@ -12,7 +12,7 @@ typedef int errcode;
#define unlikely(x) __builtin_expect((x), 0)
int
error_handling_init();
error_handling_init(PyObject* core_module);
extern PyObject* internal_error;

5
src/core/jsproxy.c
View File

@ -1446,7 +1446,6 @@ Buffer_dealloc(PyObject* self)
static int
Buffer_GetBuffer(PyObject* obj, Py_buffer* view, int flags)
{
bool success = false;
Buffer* self = (Buffer*)obj;
view->obj = NULL;
// This gets decremented automatically by PyBuffer_Release (even though
@ -1467,9 +1466,7 @@ Buffer_GetBuffer(PyObject* obj, Py_buffer* view, int flags)
view->strides = NULL;
view->suboffsets = NULL;
success = true;
finally:
return success ? 0 : -1;
return 0;
}
static PyBufferProcs Buffer_BufferProcs = {

26
src/core/pyproxy.c
View File

@ -218,7 +218,6 @@ _pyproxy_type(PyObject* ptrobj)
int
_pyproxy_hasattr(PyObject* pyobj, JsRef idkey)
{
bool success = false;
PyObject* pykey = NULL;
int result = -1;
@ -226,7 +225,6 @@ _pyproxy_hasattr(PyObject* pyobj, JsRef idkey)
FAIL_IF_NULL(pykey);
result = PyObject_HasAttr(pyobj, pykey);
success = true;
finally:
Py_CLEAR(pykey);
return result;
@ -778,7 +776,7 @@ size_t py_buffer_shape_offset = offsetof(Py_buffer, shape);
/**
* Convert a C array of Py_ssize_t to JavaScript.
*/
EM_JS_REF(JsRef, array_to_js, (Py_ssize_t * array, int len), {
EM_JS(JsRef, array_to_js, (Py_ssize_t * array, int len), {
return Hiwire.new_value(
Array.from(HEAP32.subarray(array / 4, array / 4 + len)));
})
@ -839,7 +837,6 @@ _pyproxy_get_buffer(buffer_struct* target, PyObject* ptrobj)
return -1;
}
bool success = false;
buffer_struct result = { 0 };
result.start_ptr = result.smallest_ptr = result.largest_ptr = view.buf;
result.readonly = view.readonly;
@ -893,21 +890,12 @@ _pyproxy_get_buffer(buffer_struct* target, PyObject* ptrobj)
result.f_contiguous = PyBuffer_IsContiguous(&view, 'F');
success:
success = true;
finally:
if (success) {
// The result.view memory will be freed when (if?) the user calls
// Py_Buffer.release().
result.view = (Py_buffer*)PyMem_Malloc(sizeof(Py_buffer));
*result.view = view;
*target = result;
return 0;
} else {
hiwire_CLEAR(result.shape);
hiwire_CLEAR(result.strides);
PyBuffer_Release(&view);
return -1;
}
// The result.view memory will be freed when (if?) the user calls
// Py_Buffer.release().
result.view = (Py_buffer*)PyMem_Malloc(sizeof(Py_buffer));
*result.view = view;
*target = result;
return 0;
}
EM_JS_REF(JsRef, pyproxy_new, (PyObject * ptrobj), {