Skip to content
Permalink
Browse files
Removed unintentional trailing spaces in non-external and non-generat…
…ed C files.
  • Loading branch information
serhiy-storchaka committed Mar 18, 2015
1 parent 6c32585 commit 009b811d678f36cf63be4fe26f3fbaa38aa0078e
Show file tree
Hide file tree
Showing 25 changed files with 56 additions and 56 deletions.
@@ -38,7 +38,7 @@ static PyModuleDef noddymodule = {
};

PyMODINIT_FUNC
PyInit_noddy(void)
PyInit_noddy(void)
{
PyObject* m;

@@ -71,7 +71,7 @@ PyAPI_FUNC(int) PyCodec_KnownEncoding(
object is passed through the encoder function found for the given
encoding using the error handling method defined by errors. errors
may be NULL to use the default method defined for the codec.
Raises a LookupError in case no encoder can be found.
*/
@@ -87,7 +87,7 @@ PyAPI_FUNC(PyObject *) PyCodec_Encode(
object is passed through the decoder function found for the given
encoding using the error handling method defined by errors. errors
may be NULL to use the default method defined for the codec.
Raises a LookupError in case no encoder can be found.
*/
@@ -145,7 +145,7 @@ PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalEncoder(



/* --- Codec Lookup APIs --------------------------------------------------
/* --- Codec Lookup APIs --------------------------------------------------
All APIs return a codec object with incremented refcount and are
based on _PyCodec_Lookup(). The same comments w/r to the encoding
@@ -41,7 +41,7 @@ PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
Py_ssize_t *start, Py_ssize_t *stop,
Py_ssize_t *start, Py_ssize_t *stop,
Py_ssize_t *step, Py_ssize_t *slicelength);

#ifdef __cplusplus
@@ -16,7 +16,7 @@ typedef struct {
int size;

/* Get name for a given character code. Returns non-zero if
success, zero if not. Does not set Python exceptions.
success, zero if not. Does not set Python exceptions.
If self is NULL, data come from the default version of the database.
If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */
int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen,
@@ -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;
@@ -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;
@@ -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
@@ -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."

@@ -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 @@ ndarray_as_list(NDArrayObject *nd)
+-----------------+-----------+-------------+----------------+
| 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 @@ cmp_contig(PyObject *self, PyObject *args)
PyBuffer_Release(&v1);
PyBuffer_Release(&v2);

ret = equal ? Py_True : Py_False;
ret = equal ? Py_True : Py_False;
Py_INCREF(ret);
return ret;
}
@@ -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)
{
@@ -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;
@@ -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));
@@ -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},
};
@@ -260,7 +260,7 @@ method_repr(PyMethodObject *a)
PyErr_Clear();
}
}

if (funcname != NULL && !PyUnicode_Check(funcname)) {
Py_DECREF(funcname);
funcname = NULL;
@@ -212,7 +212,7 @@ calliter_iternext(calliterobject *it)
Py_DECREF(args);
if (result != NULL) {
int ok;
ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ);
ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ);
if (ok == 0)
return result; /* Common case, fast path */
Py_DECREF(result);
@@ -892,7 +892,7 @@ memory_from_contiguous_copy(Py_buffer *src, char order)
The logical structure of the input and output buffers is the same
(i.e. tolist(input) == tolist(output)), but the physical layout in
memory can be explicitly chosen.
As usual, if buffertype=PyBUF_WRITE, the exporter's buffer must be writable,
otherwise it may be writable or read-only.
@@ -1241,7 +1241,7 @@ cast_to_1D(PyMemoryViewObject *mv, PyObject *format)
view->suboffsets = NULL;

init_flags(mv);

ret = 0;

out:
@@ -2288,7 +2288,7 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key)
{
Py_buffer *view;
view = &(self->view);

CHECK_RELEASED(self);

if (view->ndim == 0) {
@@ -37,7 +37,7 @@ module_init_dict(PyModuleObject *mod, PyObject *md_dict,
_Py_IDENTIFIER(__package__);
_Py_IDENTIFIER(__loader__);
_Py_IDENTIFIER(__spec__);

if (md_dict == NULL)
return -1;
if (doc == NULL)
@@ -987,7 +987,7 @@ static PyObject *
longrangeiter_setstate(longrangeiterobject *r, PyObject *state)
{
int cmp;

/* clip the value */
PyObject *zero = PyLong_FromLong(0);
if (zero == NULL)
@@ -1007,7 +1007,7 @@ longrangeiter_setstate(longrangeiterobject *r, PyObject *state)
return NULL;
if (cmp > 0)
state = r->len;

Py_CLEAR(r->index);
r->index = state;
Py_INCREF(r->index);
@@ -59,7 +59,7 @@ stringlib_expandtabs(PyObject *self, PyObject *args, PyObject *kwds)

j = 0;
q = STRINGLIB_STR(u);

for (p = STRINGLIB_STR(self); p < e; p++) {
if (*p == '\t') {
if (tabsize > 0) {
@@ -27,7 +27,7 @@
#define EXTENDED_CASE_MASK 0x4000

typedef struct {
/*
/*
These are either deltas to the character or offsets in
_PyUnicode_ExtendedCase.
*/
@@ -96,7 +96,7 @@ error(int rc, wchar_t * format, ... )
fwprintf(stderr, L"%ls\n", message);
#else
MessageBox(NULL, message, TEXT("Python Launcher is sorry to say ..."),
MB_OK);
MB_OK);
#endif
ExitProcess(rc);
}
@@ -349,7 +349,7 @@ locate_all_pythons()
locate_pythons_for_key(HKEY_CURRENT_USER, KEY_READ | KEY_WOW64_64KEY);
locate_pythons_for_key(HKEY_LOCAL_MACHINE, KEY_READ | KEY_WOW64_64KEY);
}
#endif
#endif
// now hit the "native" key for this process bittedness.
debug(L"locating Pythons in native registry\n");
locate_pythons_for_key(HKEY_CURRENT_USER, KEY_READ);
@@ -604,7 +604,7 @@ run_child(wchar_t * cmdline)
// window, or fetching a message). As this launcher doesn't do this
// directly, that cursor remains even after the child process does these
// things. We avoid that by doing a simple post+get message.
// See http://bugs.python.org/issue17290 and
// See http://bugs.python.org/issue17290 and
// https://bitbucket.org/vinay.sajip/pylauncher/issue/20/busy-cursor-for-a-long-time-when-running
MSG msg;

0 comments on commit 009b811

Please sign in to comment.