8000 Whitespace and line lengrth cleanup. · python/cpython@5dde61d · GitHub
[go: up one dir, main page]
Skip to content

Commit 5dde61d

Browse files
gvanrossumgvanrossum
committed
Whitespace and line lengrth cleanup.
1 parent 3f6d44e commit 5dde61d

File tree

1 file changed

+50
-47
lines changed

1 file changed

+50
-47
lines changed

‎Objects/memoryobject.c

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
static int
77
memory_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags)
88
{
9-
if (view != NULL)
9+
if (view != NULL)
1010
*view = self->view;
11-
return self->base->ob_type->tp_as_buffer->bf_getbuffer(self->base,
12-
NULL, PyBUF_FULL);
11+
return self->base->ob_type->tp_as_buffer->bf_getbuffer(self->base, NULL,
12+
PyBUF_FULL);
1313
}
1414

1515
static void
16-
memory_releasebuf(PyMemoryViewObject *self, Py_buffer *view)
16+
memory_releasebuf(PyMemoryViewObject *self, Py_buffer *view)
1717
{
1818
PyObject_ReleaseBuffer(self->base, NULL);
1919
}
@@ -42,16 +42,16 @@ PyMemoryView_FromObject(PyObject *base)
4242
PyMemoryViewObject *mview;
4343

4444
if (!PyObject_CheckBuffer(base)) {
45-
PyErr_SetString(PyExc_TypeError,
46-
"cannot make memory view because object does "\
8000 45+
PyErr_SetString(PyExc_TypeError,
46+
"cannot make memory view because object does "
4747
"not have the buffer interface");
48-
return NULL;
48+
return NULL;
4949
}
50-
51-
mview = (PyMemoryViewObject *)PyObject_New(PyMemoryViewObject,
50+
51+
mview = (PyMemoryViewObject *)PyObject_New(PyMemoryViewObject,
5252
&PyMemoryView_Type);
5353
if (mview == NULL) return NULL;
54-
54+
5555
mview->base = NULL;
5656
if (PyObject_GetBuffer(base, &(mview->view), PyBUF_FULL) < 0) {
5757
Py_DECREF(mview);
@@ -69,12 +69,12 @@ memory_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
6969
PyObject *obj;
7070
if (!PyArg_UnpackTuple(args, "memoryview", 1, 1, &obj)) return NULL;
7171

72-
return PyMemoryView_FromObject(obj);
72+
return PyMemoryView_FromObject(obj);
7373
}
7474

7575

7676
static void
77-
_strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
77+
_strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
7878
Py_ssize_t *strides, int itemsize, char fort)
7979
{
8080
int k;
@@ -92,23 +92,23 @@ _strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
9292
}
9393
else {
9494
if (fort == 'F') {
95-
/* Copy first dimension first,
95+
/* Copy first dimension first,
9696
second dimension second, etc...
9797
Set up the recursive loop backwards so that final
98-
dimension is actually copied last.
98+
dimension is actually copied last.
9999
*/
100100
outstride = itemsize;
101101
for (k=1; k<nd-1;k++) {
102102
outstride *= shape[k];
103103
}
104104
for (k=0; k<shape[nd-1]; k++) {
105-
_strided_copy_nd(dest, src, nd-1, shape,
105+
_strided_copy_nd(dest, src, nd-1, shape,
106106
strides, itemsize, fort);
107107
dest += outstride;
108108
src += strides[nd-1];
109109
}
110110
}
111-
111+
112112
else {
113113
/* Copy last dimension first,
114114
second-to-last dimension second, etc.
@@ -121,7 +121,7 @@ _strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
121121
}
122122
for (k=0; k<shape[0]; k++) {
123123
_strided_copy_nd(dest, src, nd-1, shape+1,
124-
strides+1, itemsize,
124+
strides+1, itemsize,
125125
fort);
126126
dest += outstride;
127127
src += strides[0];
@@ -142,8 +142,8 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
142142
Py_ssize_t elements;
143143
char *ptr;
144144
void (*func)(int, Py_ssize_t *, Py_ssize_t *);
145-
146-
145+
146+
147147
/* XXX(nnorwitz): need to check for overflow! */
148148
indices = (Py_ssize_t *)PyMem_Malloc(sizeof(Py_ssize_t)*view->ndim);
149149
if (indices == NULL) {
@@ -153,7 +153,7 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
153153
for (k=0; k<view->ndim;k++) {
154154
indices[k] = 0;
155155
}
156-
156+
157157
elements = 1;
158158
for (k=0; k<view->ndim; k++) {
159159
elements *= view->shape[k];
@@ -170,26 +170,26 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
170170
memcpy(dest, ptr, view->itemsize);
171171
dest += view->itemsize;
172172
}
173-
173+
174174
PyMem_Free(indices);
175175
return 0;
176176
}
177177

178-
/*
178+
/*
179179
Get a the data from an object as a contiguous chunk of memory (in
180180
either 'C' or 'F'ortran order) even if it means copying it into a
181181
separate memory area.
182182
183183
Returns a new reference to a Memory view object. If no copy is needed,
184-
the memory view object points to the original memory and holds a
184+
the memory view object points to the original memory and holds a
185185
lock on the original. If a copy is needed, then the memory view object
186-
points to a brand-new Bytes object (and holds a memory lock on it).
186+
points to a brand-new Bytes object (and holds a memory lock on it).
187187
188188
buffertype
189189
190190
PyBUF_READ buffer only needs to be read-only
191191
PyBUF_WRITE buffer needs to be writable (give error if not contiguous)
192-
PyBUF_SHADOW buffer needs to be writable so shadow it with
192+
PyBUF_SHADOW buffer needs to be writable so shadow it with
193193
a contiguous buffer if it is not. The view will point to
194194
the shadow buffer which can be written to and then
195195
will be copied back into the other buffer when the memory
@@ -210,7 +210,7 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)
210210
"object does not have the buffer interface");
211211
return NULL;
212212
}
213-
213+
214214
mem = PyObject_New(PyMemoryViewObject, &PyMemoryView_Type);
215215
if (mem == NULL) return NULL;
216216

@@ -240,8 +240,8 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)
240240
if (buffertype == PyBUF_WRITE) {
241241
PyObject_DEL(mem);
242242
PyErr_SetString(PyExc_BufferError,
243-
"writable contiguous buffer requested for a non-contiguous" \
244-
"object.");
243+
"writable contiguous buffer requested "
244+
"for a non-contiguousobject.");
245245
return NULL;
246246
}
247247
bytes = PyBytes_FromStringAndSize(NULL, view->len);
@@ -255,15 +255,15 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)
255255
*/
256256
/* strided or in-direct copy */
257257
if (view->suboffsets==NULL) {
258-
_strided_copy_nd(dest, view->buf, view->ndim, view->shape,
259-
view->strides, view->itemsize, fort);
258+
_strided_copy_nd(dest, view->buf, view->ndim, view->shape,
259+
view->strides, view->itemsize, fort);
260260
}
261261
else {
262262
if (_indirect_copy_nd(dest, view, fort) < 0) {
263263
Py_DECREF(bytes);
264264
PyObject_ReleaseBuffer(obj, view);
265265
return NULL;
266-
}
266+
}
267267
}
268268
if (buffertype == PyBUF_SHADOW) {
269269
/* return a shadowed memory-view object */
@@ -356,7 +356,7 @@ memory_ndim_get(PyMemoryViewObject *self)
356356
return PyInt_FromLong(self->view.ndim);
357357
}
358358

359-
static PyGetSetDef memory_getsetlist[] ={
359+
static PyGetSetDef memory_getsetlist[] ={
360360
{"format", (getter)memory_format_get, NULL, NULL},
361361
{"itemsize", (getter)memory_itemsize_get, NULL, NULL},
362362
{"shape", (getter)memory_shape_get, NULL, NULL},
@@ -379,7 +379,7 @@ static PyObject *
379379
memory_tolist(PyMemoryViewObject *mem, PyObject *noargs)
380380
{
381381
/* This should construct a (nested) list of unpacked objects
382-
possibly using the struct module.
382+
possibly using the struct module.
383383
*/
384384
Py_INCREF(Py_NotImplemented);
385385
return Py_NotImplemented;
@@ -403,16 +403,16 @@ memory_dealloc(PyMemoryViewObject *self)
403403
with buffer interface and the second element is a
404404
contiguous "shadow" that must be copied back into
405405
the data areay of the first tuple element before
406-
releasing the buffer on the first element.
406+
releasing the buffer on the first element.
407407
*/
408-
408+
409409
PyObject_CopyData(PyTuple_GET_ITEM(self->base,0),
410410
PyTuple_GET_ITEM(self->base,1));
411411

412412
/* The view member should have readonly == -1 in
413413
this instance indicating that the memory can
414414
be "locked" and was locked and will be unlocked
415-
again after this call.
415+
again after this call.
416416
*/
417417
PyObject_ReleaseBuffer(PyTuple_GET_ITEM(self->base,0),
418418
&(self->view));
@@ -444,7 +444,7 @@ memory_str(PyMemoryViewObject *self)
444444

445445
if (PyObject_GetBuffer((PyObject *)self, &view, PyBUF_FULL) < 0)
446446
return NULL;
447-
447+
448448
res = PyBytes_FromStringAndSize(NULL, view.len);
449449
PyBuffer_ToContiguous(PyBytes_AS_STRING(res), &view, view.len, 'C');
450450
PyObject_ReleaseBuffer((PyObject *)self, &view);
@@ -464,13 +464,13 @@ memory_length(PyMemoryViewObject *self)
464464
return view.len;
465465
}
466466

467-
/*
467+
/*
468468
mem[obj] returns a bytes object holding the data for one element if
469469
obj fully indexes the memory view or another memory-view object
470470
if it does not.
471-
471+
472472
0-d memory-view objects can be referenced using ... or () but
473-
not with anything else.
473+
not with anything else.
474474
*/
475475
static PyObject *
476476
memory_subscript(PyMemoryViewObject *self, PyObject *key)
@@ -485,7 +485,8 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key)
485485
return (PyObject *)self;
486486
}
487487
else {
488-
PyErr_SetString(PyExc_IndexError, "invalid indexing of 0-dim memory");
488+
PyErr_SetString(PyExc_IndexError,
489+
"invalid indexing of 0-dim memory");
489490
return NULL;
490491
}
491492
}
@@ -498,23 +499,25 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key)
498499
/* Return a bytes object */
499500
char *ptr;
500501
ptr = (char *)view->buf;
501-
if (view->strides == NULL)
502+
if (view->strides == NULL)
502503
ptr += view->itemsize * result;
503504
else
504505
ptr += view->strides[0] * result;
505-
if (view->suboffsets != NULL && view->suboffsets[0] >= 0) {
506+
if (view->suboffsets != NULL &&
507+
view->suboffsets[0] >= 0)
508+
{
506509
ptr = *((char **)ptr) + view->suboffsets[0];
507510
}
508511
return PyBytes_FromStringAndSize(ptr, view->itemsize);
509512
}
510513
else {
511-
/* Return a new memory-view object */
514+
/* Return a new memory-view object */
512515
Py_buffer newview;
513516
PyMemoryView_FromMemory(&newview);
514517
}
515518
}
516-
517-
519+
520+
518521

519522
Py_INCREF(Py_NotImplemented);
520523
return Py_NotImplemented;
@@ -570,7 +573,7 @@ PyTypeObject PyMemoryView_Type = {
570573
0, /* tp_weaklistoffset */
571574
0, /* tp_iter */
572575
0, /* tp_iternext */
573-
memory_methods, /* tp_methods */
576+
memory_methods, /* tp_methods */
574577
0, /* tp_members */
575578
memory_getsetlist, /* tp_getset */
576579
0, /* tp_base */

0 commit comments

Comments
 (0)
0