Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Include/pybuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef struct {
pointed to by strides in simple case.*/
int readonly;
int ndim;
char *format;
const char *format;
Py_ssize_t *shape;
Py_ssize_t *strides;
Py_ssize_t *suboffsets;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The member ``format`` of ``Py_buffer`` is now of type ``const char *``
rather than of type ``char *``. Contributed by High Performance Kernels
LLC.
4 changes: 2 additions & 2 deletions Modules/_testbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ ndbuf_free(ndbuf_t *ndbuf)
Py_buffer *base = &ndbuf->base;

PyMem_XFree(ndbuf->data);
PyMem_XFree(base->format);
PyMem_XFree((void*)base->format);
PyMem_XFree(base->shape);
PyMem_XFree(base->strides);
PyMem_XFree(base->suboffsets);
Expand Down Expand Up @@ -666,7 +666,7 @@ ndarray_as_list(NDArrayObject *nd)
Py_ssize_t simple_strides[1];
char *item = NULL;
PyObject *format;
char *fmt = base->format;
const char *fmt = base->format;

base = &nd->head->base;

Expand Down
2 changes: 1 addition & 1 deletion Modules/arraymodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -2907,7 +2907,7 @@ array_buffer_getbuf(PyObject *op, Py_buffer *view, int flags)
view->format = NULL;
view->internal = NULL;
if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
view->format = (char *)self->ob_descr->typecode;
view->format = self->ob_descr->typecode;
}

self->ob_exports++;
Expand Down
4 changes: 2 additions & 2 deletions Objects/memoryobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ mbuf_dealloc(PyObject *_self)
assert(self->exports == 0);
mbuf_release(self);
if (self->flags&_Py_MANAGED_BUFFER_FREE_FORMAT)
PyMem_Free(self->master.format);
PyMem_Free((void*)self->master.format);
PyObject_GC_Del(self);
}

Expand Down Expand Up @@ -1340,7 +1340,7 @@ cast_to_1D(PyMemoryViewObject *mv, PyObject *format)
goto out;
}

view->format = (char *)get_native_fmtstr(PyBytes_AS_STRING(asciifmt));
view->format = get_native_fmtstr(PyBytes_AS_STRING(asciifmt));
if (view->format == NULL) {
/* NOT_REACHED: get_native_fmtchar() already validates the format. */
PyErr_SetString(PyExc_RuntimeError,
Expand Down
Loading