diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-03-18 19:53:15 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-03-18 19:53:15 (GMT) |
commit | 009b811d678f36cf63be4fe26f3fbaa38aa0078e (patch) | |
tree | a24ddae0e641ac1bce8a5b33526bd05bd04d264c /Modules | |
parent | 6c32585f677b71eb1206852d24f077f602780c85 (diff) | |
download | cpython-009b811d678f36cf63be4fe26f3fbaa38aa0078e.zip cpython-009b811d678f36cf63be4fe26f3fbaa38aa0078e.tar.gz cpython-009b811d678f36cf63be4fe26f3fbaa38aa0078e.tar.bz2 |
Removed unintentional trailing spaces in non-external and non-generated C files.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_bz2module.c | 2 | ||||
-rw-r--r-- | Modules/_io/bufferedio.c | 4 | ||||
-rw-r--r-- | Modules/_lzmamodule.c | 20 | ||||
-rw-r--r-- | Modules/_sqlite/microprotocols.h | 2 | ||||
-rw-r--r-- | Modules/_testbuffer.c | 8 | ||||
-rw-r--r-- | Modules/_testcapimodule.c | 2 | ||||
-rw-r--r-- | Modules/atexitmodule.c | 8 | ||||
-rw-r--r-- | Modules/parsermodule.c | 2 | ||||
-rw-r--r-- | Modules/xxlimited.c | 2 |
9 files changed, 25 insertions, 25 deletions
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c index f284cd6..51da7ae 100644 --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -666,7 +666,7 @@ _bz2_BZ2Decompressor___init___impl(BZ2Decompressor *self) self->unused_data = PyBytes_FromStringAndSize(NULL, 0); if (self->unused_data == NULL) goto error; - + bzerror = BZ2_bzDecompressInit(&self->bzs, 0, 0); if (catch_bz2_error(bzerror)) goto error; diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 370bb5e..358a94d 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1055,7 +1055,7 @@ _buffered_readinto_generic(buffered *self, PyObject *args, char readinto1) } else n = 0; - + if (n == 0 || (n == -2 && written > 0)) break; if (n < 0) { @@ -1065,7 +1065,7 @@ _buffered_readinto_generic(buffered *self, PyObject *args, char readinto1) } goto end; } - + /* At most one read in readinto1 mode */ if (readinto1) { written += n; diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c index bae7df6..9abdf63 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -149,10 +149,10 @@ grow_buffer(PyObject **buf, Py_ssize_t max_length) { Py_ssize_t size = PyBytes_GET_SIZE(*buf); Py_ssize_t newsize = size + (size >> 3) + 6; - + if (max_length > 0 && newsize > max_length) newsize = max_length; - + return _PyBytes_Resize(buf, newsize); } @@ -906,7 +906,7 @@ decompress_buf(Decompressor *d, Py_ssize_t max_length) Py_ssize_t data_size = 0; PyObject *result; lzma_stream *lzs = &d->lzs; - + if (max_length < 0 || max_length >= INITIAL_BUFFER_SIZE) result = PyBytes_FromStringAndSize(NULL, INITIAL_BUFFER_SIZE); else @@ -916,7 +916,7 @@ decompress_buf(Decompressor *d, Py_ssize_t max_length) lzs->next_out = (uint8_t *)PyBytes_AS_STRING(result); lzs->avail_out = PyBytes_GET_SIZE(result); - + for (;;) { lzma_ret lzret; @@ -947,7 +947,7 @@ decompress_buf(Decompressor *d, Py_ssize_t max_length) goto error; return result; - + error: Py_XDECREF(result); return NULL; @@ -959,11 +959,11 @@ decompress(Decompressor *d, uint8_t *data, size_t len, Py_ssize_t max_length) char input_buffer_in_use; PyObject *result; lzma_stream *lzs = &d->lzs; - + /* Prepend unconsumed input if necessary */ if (lzs->next_in != NULL) { size_t avail_now, avail_total; - + /* Number of bytes we can append to input buffer */ avail_now = (d->input_buffer + d->input_buffer_size) - (lzs->next_in + lzs->avail_in); @@ -987,7 +987,7 @@ decompress(Decompressor *d, uint8_t *data, size_t len, Py_ssize_t max_length) } d->input_buffer = tmp; d->input_buffer_size = new_size; - + lzs->next_in = d->input_buffer + offset; } else if (avail_now < len) { @@ -1054,7 +1054,7 @@ decompress(Decompressor *d, uint8_t *data, size_t len, Py_ssize_t max_length) lzs->next_in = d->input_buffer; } } - + return result; error: @@ -1247,7 +1247,7 @@ Decompressor_dealloc(Decompressor *self) { if(self->input_buffer != NULL) PyMem_Free(self->input_buffer); - + lzma_end(&self->lzs); Py_CLEAR(self->unused_data); #ifdef WITH_THREAD diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h index 3a9944f..6941716 100644 --- a/Modules/_sqlite/microprotocols.h +++ b/Modules/_sqlite/microprotocols.h @@ -48,7 +48,7 @@ extern PyObject *pysqlite_microprotocols_adapt( PyObject *obj, PyObject *proto, PyObject *alt); extern PyObject * - pysqlite_adapt(pysqlite_Cursor* self, PyObject *args); + pysqlite_adapt(pysqlite_Cursor* self, PyObject *args); #define pysqlite_adapt_doc \ "adapt(obj, protocol, alternate) -> adapt obj to given protocol. Non-standard." diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c index de7b567..43db8a8 100644 --- a/Modules/_testbuffer.c +++ b/Modules/_testbuffer.c @@ -190,7 +190,7 @@ ndbuf_delete(NDArrayObject *nd, ndbuf_t *elt) elt->prev->next = elt->next; else nd->head = elt->next; - + if (elt->next) elt->next->prev = elt->prev; @@ -767,7 +767,7 @@ out: +-----------------+-----------+-------------+----------------+ | base.readonly | 0 | OK | OK | +-----------------+-----------+-------------+----------------+ - | base.format | NULL | OK | OK | + | base.format | NULL | OK | OK | +-----------------+-----------+-------------+----------------+ | base.ndim | 1 | 1 | OK | +-----------------+-----------+-------------+----------------+ @@ -2018,7 +2018,7 @@ ndarray_get_obj(NDArrayObject *self, void *closure) { Py_buffer *base = &self->head->base; - if (base->obj == NULL) { + if (base->obj == NULL) { Py_RETURN_NONE; } Py_INCREF(base->obj); @@ -2558,7 +2558,7 @@ result: PyBuffer_Release(&v1); PyBuffer_Release(&v2); - ret = equal ? Py_True : Py_False; + ret = equal ? Py_True : Py_False; Py_INCREF(ret); return ret; } diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index a8ce0dc..df35197 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2476,7 +2476,7 @@ make_memoryview_from_NULL_pointer(PyObject *self) return NULL; return PyMemoryView_FromBuffer(&info); } - + static PyObject * test_from_contiguous(PyObject* self, PyObject *noargs) { diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c index 79e9962..739c188 100644 --- a/Modules/atexitmodule.c +++ b/Modules/atexitmodule.c @@ -94,7 +94,7 @@ atexit_callfuncs(void) if (exc_type) { Py_DECREF(exc_type); Py_XDECREF(exc_value); - Py_XDECREF(exc_tb); + Py_XDECREF(exc_tb); } PyErr_Fetch(&exc_type, &exc_value, &exc_tb); if (!PyErr_ExceptionMatches(PyExc_SystemExit)) { @@ -147,7 +147,7 @@ atexit_register(PyObject *self, PyObject *args, PyObject *kwargs) if (PyTuple_GET_SIZE(args) == 0) { PyErr_SetString(PyExc_TypeError, "register() takes at least 1 argument (0 given)"); - return NULL; + return NULL; } func = PyTuple_GET_ITEM(args, 0); @@ -159,7 +159,7 @@ atexit_register(PyObject *self, PyObject *args, PyObject *kwargs) new_callback = PyMem_Malloc(sizeof(atexit_callback)); if (new_callback == NULL) - return PyErr_NoMemory(); + return PyErr_NoMemory(); new_callback->args = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args)); if (new_callback->args == NULL) { @@ -336,7 +336,7 @@ PyInit_atexit(void) modstate = GET_ATEXIT_STATE(m); modstate->callback_len = 32; modstate->ncallbacks = 0; - modstate->atexit_callbacks = PyMem_New(atexit_callback*, + modstate->atexit_callbacks = PyMem_New(atexit_callback*, modstate->callback_len); if (modstate->atexit_callbacks == NULL) return NULL; diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 36e9893..56ee445 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -2788,7 +2788,7 @@ validate_argument(node *tree) int nch = NCH(tree); int res = (validate_ntype(tree, argument) && ((nch == 1) || (nch == 2) || (nch == 3))); - if (res) + if (res) res = validate_test(CHILD(tree, 0)); if (res && (nch == 2)) res = validate_comp_for(CHILD(tree, 1)); diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c index eecdab9..7bfcb91 100644 --- a/Modules/xxlimited.c +++ b/Modules/xxlimited.c @@ -169,7 +169,7 @@ xx_roj(PyObject *self, PyObject *args) /* ---------- */ -static PyType_Slot Str_Type_slots[] = { +static PyType_Slot Str_Type_slots[] = { {Py_tp_base, NULL}, /* filled out in module init function */ {0, 0}, }; |