[Python-checkins] [3.11] Trim trailing whitespace and test on CI (GH-104275) (#108215)
hugovk
webhook-mailer at python.org
Tue Aug 22 05:57:34 EDT 2023
https://github.com/python/cpython/commit/d678ee771931a391212ef41e61e9717b43867e35
commit: d678ee771931a391212ef41e61e9717b43867e35
branch: 3.11
author: Hugo van Kemenade <hugovk at users.noreply.github.com>
committer: hugovk <hugovk at users.noreply.github.com>
date: 2023-08-22T12:57:31+03:00
summary:
[3.11] Trim trailing whitespace and test on CI (GH-104275) (#108215)
files:
A .github/workflows/lint.yml
A .pre-commit-config.yaml
M .github/CODEOWNERS
M Lib/test/test_asyncio/test_runners.py
M Lib/test/test_isinstance.py
M Modules/_blake2/blake2module.h
M Modules/_blake2/impl/blake2b-round.h
M Modules/_blake2/impl/blake2s-load-xop.h
M Modules/_blake2/impl/blake2s-round.h
M Modules/_ctypes/darwin/dlfcn.h
M Modules/_ctypes/libffi_osx/ffi.c
M Modules/_ctypes/libffi_osx/include/ffi.h
M Modules/_ctypes/libffi_osx/include/ffi_common.h
M Modules/_ctypes/libffi_osx/include/fficonfig.h
M Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
M Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
M Modules/_ctypes/libffi_osx/types.c
M Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
M Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
M Modules/_io/_iomodule.c
M Modules/termios.c
M PC/winreg.c
M Tools/msi/bundle/bootstrap/pch.h
M Tools/msi/bundle/bootstrap/resource.h
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3d39e0c4ef041..99d701daa1d49 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,7 +5,10 @@
# https://git-scm.com/docs/gitignore#_pattern_format
# GitHub
-.github/** @ezio-melotti
+.github/** @ezio-melotti @hugovk
+
+# pre-commit
+.pre-commit-config.yaml @hugovk @AlexWaygood
# asyncio
**/*asyncio* @1st1 @asvetlov
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000000000..4481ea80bfd93
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,22 @@
+name: Lint
+
+on: [push, pull_request, workflow_dispatch]
+
+permissions:
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ lint:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - uses: actions/checkout at v3
+ - uses: actions/setup-python at v4
+ with:
+ python-version: "3.x"
+ - uses: pre-commit/action at v3.0.0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000000..808622f19a3db
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.4.0
+ hooks:
+ - id: check-yaml
+ - id: trailing-whitespace
+ types_or: [c, python, rst]
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index 8a4aba6d470ba..ae823cc7bec33 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -441,7 +441,7 @@ async def coro():
with asyncio.Runner() as runner:
with self.assertRaises(asyncio.CancelledError):
runner.run(coro())
-
+
def test_signal_install_not_supported_ok(self):
# signal.signal() can throw if the "main thread" doensn't have signals enabled
assert threading.current_thread() is threading.main_thread()
diff --git a/Lib/test/test_isinstance.py b/Lib/test/test_isinstance.py
index a0974640bc114..a8315a4a9123d 100644
--- a/Lib/test/test_isinstance.py
+++ b/Lib/test/test_isinstance.py
@@ -8,7 +8,6 @@
from test import support
-
class TestIsInstanceExceptions(unittest.TestCase):
# Test to make sure that an AttributeError when accessing the instance's
# class's bases is masked. This was actually a bug in Python 2.2 and
@@ -97,7 +96,7 @@ def getclass(self):
class D: pass
self.assertRaises(RuntimeError, isinstance, c, D)
-
+
# These tests are similar to above, but tickle certain code paths in
# issubclass() instead of isinstance() -- really PyObject_IsSubclass()
# vs. PyObject_IsInstance().
@@ -147,7 +146,6 @@ def getbases(self):
self.assertRaises(TypeError, issubclass, B, C())
-
# meta classes for creating abstract classes and instances
class AbstractClass(object):
def __init__(self, bases):
@@ -179,7 +177,7 @@ class Super:
class Child(Super):
pass
-
+
class TestIsInstanceIsSubclass(unittest.TestCase):
# Tests to ensure that isinstance and issubclass work on abstract
# classes and instances. Before the 2.2 release, TypeErrors were
@@ -357,6 +355,6 @@ def blowstack(fxn, arg, compare_to):
tuple_arg = (tuple_arg,)
fxn(arg, tuple_arg)
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/Modules/_blake2/blake2module.h b/Modules/_blake2/blake2module.h
index aa8f281178ead..c8144ec9d48d2 100644
--- a/Modules/_blake2/blake2module.h
+++ b/Modules/_blake2/blake2module.h
@@ -38,6 +38,6 @@
#endif // HAVE_LIBB2
// for secure_zero_memory(), store32(), store48(), and store64()
-#include "impl/blake2-impl.h"
+#include "impl/blake2-impl.h"
#endif // Py_BLAKE2MODULE_H
diff --git a/Modules/_blake2/impl/blake2b-round.h b/Modules/_blake2/impl/blake2b-round.h
index cebc22550da4c..5b452c4d63bab 100644
--- a/Modules/_blake2/impl/blake2b-round.h
+++ b/Modules/_blake2/impl/blake2b-round.h
@@ -62,7 +62,7 @@
\
row2l = _mm_roti_epi64(row2l, -24); \
row2h = _mm_roti_epi64(row2h, -24); \
-
+
#define G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \
row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \
@@ -81,7 +81,7 @@
\
row2l = _mm_roti_epi64(row2l, -63); \
row2h = _mm_roti_epi64(row2h, -63); \
-
+
#if defined(HAVE_SSSE3)
#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
t0 = _mm_alignr_epi8(row2h, row2l, 8); \
diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h
index ac591a77d191a..14d9e7f764067 100644
--- a/Modules/_blake2/impl/blake2s-load-xop.h
+++ b/Modules/_blake2/impl/blake2s-load-xop.h
@@ -166,7 +166,7 @@ buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(7)) );
#define LOAD_MSG_8_3(buf) \
t0 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(6),TOB(1),TOB(0),TOB(0)) ); \
buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(5),TOB(4)) ); \
-
+
#define LOAD_MSG_8_4(buf) \
buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(5),TOB(4),TOB(7),TOB(2)) );
diff --git a/Modules/_blake2/impl/blake2s-round.h b/Modules/_blake2/impl/blake2s-round.h
index 1e2f2b7f59bd6..3af4be35bee5d 100644
--- a/Modules/_blake2/impl/blake2s-round.h
+++ b/Modules/_blake2/impl/blake2s-round.h
@@ -86,6 +86,6 @@
LOAD_MSG_ ##r ##_4(buf4); \
G2(row1,row2,row3,row4,buf4); \
UNDIAGONALIZE(row1,row2,row3,row4); \
-
+
#endif
diff --git a/Modules/_ctypes/darwin/dlfcn.h b/Modules/_ctypes/darwin/dlfcn.h
index a2afc3eeb8479..a9915c3115ceb 100644
--- a/Modules/_ctypes/darwin/dlfcn.h
+++ b/Modules/_ctypes/darwin/dlfcn.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2002 Jorge Acereda <jacereda at users.sourceforge.net> &
Peter O'Gorman <ogorman at users.sourceforge.net>
-
+
Portions may be copyright others, see the AUTHORS file included with this
distribution.
diff --git a/Modules/_ctypes/libffi_osx/ffi.c b/Modules/_ctypes/libffi_osx/ffi.c
index 1776b795e2f83..e16423aef19fc 100644
--- a/Modules/_ctypes/libffi_osx/ffi.c
+++ b/Modules/_ctypes/libffi_osx/ffi.c
@@ -65,12 +65,12 @@ initialize_aggregate(
arg->size = ALIGN(arg->size, curalign);
arg->size += (*ptr)->size;
- arg->alignment = (arg->alignment > curalign) ?
+ arg->alignment = (arg->alignment > curalign) ?
arg->alignment : curalign;
#else
arg->size = ALIGN(arg->size, (*ptr)->alignment);
arg->size += (*ptr)->size;
- arg->alignment = (arg->alignment > (*ptr)->alignment) ?
+ arg->alignment = (arg->alignment > (*ptr)->alignment) ?
arg->alignment : (*ptr)->alignment;
#endif
@@ -130,10 +130,10 @@ struct_on_stack(
// Arguments' ffi_type->alignment must be nonzero.
ffi_status
ffi_prep_cif(
-/*@out@*/ /*@partial@*/ ffi_cif* cif,
+/*@out@*/ /*@partial@*/ ffi_cif* cif,
ffi_abi abi,
- unsigned int nargs,
-/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype,
+ unsigned int nargs,
+/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype,
/*@dependent@*/ ffi_type** atypes)
{
unsigned int bytes = 0;
@@ -184,7 +184,7 @@ ffi_prep_cif(
if ((*ptr)->alignment == 0)
return FFI_BAD_TYPEDEF;
- /* Perform a sanity check on the argument type, do this
+ /* Perform a sanity check on the argument type, do this
check after the initialization. */
FFI_ASSERT_VALID_TYPE(*ptr);
diff --git a/Modules/_ctypes/libffi_osx/include/ffi.h b/Modules/_ctypes/libffi_osx/include/ffi.h
index c104a5c89350b..88c58fc43deb6 100644
--- a/Modules/_ctypes/libffi_osx/include/ffi.h
+++ b/Modules/_ctypes/libffi_osx/include/ffi.h
@@ -199,9 +199,9 @@ typedef union {
void
ffi_raw_call(
-/*@dependent@*/ ffi_cif* cif,
- void (*fn)(void),
-/*@out@*/ void* rvalue,
+/*@dependent@*/ ffi_cif* cif,
+ void (*fn)(void),
+/*@out@*/ void* rvalue,
/*@dependent@*/ ffi_raw* avalue);
void
@@ -225,9 +225,9 @@ ffi_raw_size(
longs and doubles are followed by an empty 64-bit word. */
void
ffi_java_raw_call(
-/*@dependent@*/ ffi_cif* cif,
- void (*fn)(void),
-/*@out@*/ void* rvalue,
+/*@dependent@*/ ffi_cif* cif,
+ void (*fn)(void),
+/*@out@*/ void* rvalue,
/*@dependent@*/ ffi_raw* avalue);
void
@@ -272,8 +272,8 @@ typedef struct ffi_raw_closure {
ffi_cif* cif;
#if !FFI_NATIVE_RAW_API
- /* if this is enabled, then a raw closure has the same layout
- as a regular closure. We use this to install an intermediate
+ /* if this is enabled, then a raw closure has the same layout
+ as a regular closure. We use this to install an intermediate
handler to do the transaltion, void** -> ffi_raw*. */
void (*translate_args)(ffi_cif*,void*,void**,void*);
void* this_closure;
@@ -303,17 +303,17 @@ ffi_prep_java_raw_closure(
ffi_status
ffi_prep_cif(
-/*@out@*/ /*@partial@*/ ffi_cif* cif,
+/*@out@*/ /*@partial@*/ ffi_cif* cif,
ffi_abi abi,
- unsigned int nargs,
-/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype,
+ unsigned int nargs,
+/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype,
/*@dependent@*/ ffi_type** atypes);
void
ffi_call(
-/*@dependent@*/ ffi_cif* cif,
- void (*fn)(void),
-/*@out@*/ void* rvalue,
+/*@dependent@*/ ffi_cif* cif,
+ void (*fn)(void),
+/*@out@*/ void* rvalue,
/*@dependent@*/ void** avalue);
/* Useful for eliminating compiler warnings */
diff --git a/Modules/_ctypes/libffi_osx/include/ffi_common.h b/Modules/_ctypes/libffi_osx/include/ffi_common.h
index 685a3580f4fe0..02b53c8600e01 100644
--- a/Modules/_ctypes/libffi_osx/include/ffi_common.h
+++ b/Modules/_ctypes/libffi_osx/include/ffi_common.h
@@ -41,7 +41,7 @@ char* alloca();
# endif
#endif
-/*#if defined(FFI_DEBUG)
+/*#if defined(FFI_DEBUG)
#include <stdio.h>
#endif*/
@@ -65,7 +65,7 @@ ffi_type_test(
# define FFI_ASSERT_AT(x, f, l) ((x) ? 0 : ffi_assert(#x, (f), (l)))
# define FFI_ASSERT_VALID_TYPE(x) ffi_type_test(x, __FILE__, __LINE__)
#else
-# define FFI_ASSERT(x)
+# define FFI_ASSERT(x)
# define FFI_ASSERT_AT(x, f, l)
# define FFI_ASSERT_VALID_TYPE(x)
#endif // #ifdef FFI_DEBUG
diff --git a/Modules/_ctypes/libffi_osx/include/fficonfig.h b/Modules/_ctypes/libffi_osx/include/fficonfig.h
index 217249071dcf4..dc0f4ecb26ee0 100644
--- a/Modules/_ctypes/libffi_osx/include/fficonfig.h
+++ b/Modules/_ctypes/libffi_osx/include/fficonfig.h
@@ -1,4 +1,4 @@
-/* Manually created fficonfig.h for Darwin on PowerPC or Intel
+/* Manually created fficonfig.h for Darwin on PowerPC or Intel
This file is manually generated to do away with the need for autoconf and
therefore make it easier to cross-compile and build fat binaries.
@@ -33,10 +33,10 @@
# define SIZEOF_DOUBLE 8
# if __GNUC__ >= 4
# define HAVE_LONG_DOUBLE 1
-# define SIZEOF_LONG_DOUBLE 16
+# define SIZEOF_LONG_DOUBLE 16
# else
# undef HAVE_LONG_DOUBLE
-# define SIZEOF_LONG_DOUBLE 8
+# define SIZEOF_LONG_DOUBLE 8
# endif
#elif defined(__ppc64__)
diff --git a/Modules/_ctypes/libffi_osx/include/x86-ffitarget.h b/Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
index 55c2b6c50cd90..df149eb14d78c 100644
--- a/Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
+++ b/Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
@@ -33,7 +33,7 @@
# define X86
#endif
-#if defined(__x86_64__)
+#if defined(__x86_64__)
# ifndef X86_64
# define X86_64
# endif
diff --git a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
index 8953d5fda3581..875412a676695 100644
--- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
+++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
@@ -891,7 +891,7 @@ ffi_closure_helper_DARWIN(
avalue[i] = alloca(arg_types[i]->size);
ffi64_struct_to_ram_form(arg_types[i], (const char*)pgr,
&gprSize, (const char*)pfr, &fprSize, &nf, avalue[i], NULL);
-
+
ng += gprSize / sizeof(long);
pgr += gprSize / sizeof(long);
pfr += (fprSize - savedFPRSize) / sizeof(double);
@@ -1479,7 +1479,7 @@ ffi64_struct_to_reg_form(
memcpy(&outGPRs[destGMarker],
&inStruct[srcMarker], inType->size);
}
-
+
srcMarker += inType->size;
destGMarker += inType->size;
i += inType->size - 1;
@@ -1561,7 +1561,7 @@ ffi64_struct_to_reg_form(
case FFI_TYPE_STRUCT:
recurseCount++;
ffi64_struct_to_reg_form(inType->elements[i],
- inStruct, &srcMarker, &fprsUsed, outGPRs,
+ inStruct, &srcMarker, &fprsUsed, outGPRs,
&destGMarker, outFPRs, &destFMarker);
recurseCount--;
break;
diff --git a/Modules/_ctypes/libffi_osx/types.c b/Modules/_ctypes/libffi_osx/types.c
index 44806aeeb75d3..761d223ff1498 100644
--- a/Modules/_ctypes/libffi_osx/types.c
+++ b/Modules/_ctypes/libffi_osx/types.c
@@ -1,6 +1,6 @@
/* -----------------------------------------------------------------------
types.c - Copyright (c) 1996, 1998 Red Hat, Inc.
-
+
Predefined ffi_types needed by libffi.
Permission is hereby granted, free of charge, to any person obtaining
@@ -85,7 +85,7 @@ FFI_INTEGRAL_TYPEDEF(sint64, 8, 8, FFI_TYPE_SINT64);
FFI_INTEGRAL_TYPEDEF(longdouble, 12, 4, FFI_TYPE_LONGDOUBLE);
# endif
-#elif defined ARM || defined SH || defined POWERPC_AIX
+#elif defined ARM || defined SH || defined POWERPC_AIX
FFI_INTEGRAL_TYPEDEF(double, 8, 4, FFI_TYPE_DOUBLE);
FFI_INTEGRAL_TYPEDEF(longdouble, 8, 4, FFI_TYPE_LONGDOUBLE);
#elif defined POWERPC_DARWIN
diff --git a/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c b/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
index 8e7d016488029..b8ae6e80231ec 100644
--- a/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
+++ b/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
@@ -2,8 +2,8 @@
/* -----------------------------------------------------------------------
x86-ffi64.c - Copyright (c) 2002 Bo Thorsen <bo at suse.de>
-
- x86-64 Foreign Function Interface
+
+ x86-64 Foreign Function Interface
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -208,7 +208,7 @@ classify_argument(
case FFI_TYPE_STRUCT:
{
- ffi_type** ptr;
+ ffi_type** ptr;
int i;
enum x86_64_reg_class subclasses[MAX_CLASSES];
const int UNITS_PER_WORD = 8;
diff --git a/Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c b/Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
index 706ea0f51206d..59e3615806739 100644
--- a/Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
+++ b/Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
@@ -4,8 +4,8 @@
Copyright (c) 2002 Ranjit Mathew
Copyright (c) 2002 Bo Thorsen
Copyright (c) 2002 Roger Sayle
-
- x86 Foreign Function Interface
+
+ x86 Foreign Function Interface
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -43,27 +43,27 @@ void ffi_prep_args(char *stack, extended_cif *ecif)
register void **p_argv;
register char *argp;
register ffi_type **p_arg;
-
+
argp = stack;
-
+
if (ecif->cif->flags == FFI_TYPE_STRUCT)
{
*(void **) argp = ecif->rvalue;
argp += 4;
}
-
+
p_argv = ecif->avalue;
-
+
for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
i != 0;
i--, p_arg++)
{
size_t z;
-
+
/* Align if necessary */
if ((sizeof(int) - 1) & (unsigned) argp)
argp = (char *) ALIGN(argp, sizeof(int));
-
+
z = (*p_arg)->size;
if (z < sizeof(int))
{
@@ -73,31 +73,31 @@ void ffi_prep_args(char *stack, extended_cif *ecif)
case FFI_TYPE_SINT8:
*(signed int *) argp = (signed int)*(SINT8 *)(* p_argv);
break;
-
+
case FFI_TYPE_UINT8:
*(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv);
break;
-
+
case FFI_TYPE_SINT16:
*(signed int *) argp = (signed int)*(SINT16 *)(* p_argv);
break;
-
+
case FFI_TYPE_UINT16:
*(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv);
break;
-
+
case FFI_TYPE_SINT32:
*(signed int *) argp = (signed int)*(SINT32 *)(* p_argv);
break;
-
+
case FFI_TYPE_UINT32:
*(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv);
break;
-
+
case FFI_TYPE_STRUCT:
*(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv);
break;
-
+
default:
FFI_ASSERT(0);
}
@@ -109,7 +109,7 @@ void ffi_prep_args(char *stack, extended_cif *ecif)
p_argv++;
argp += z;
}
-
+
return;
}
@@ -127,18 +127,18 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
case FFI_TYPE_SINT8:
case FFI_TYPE_SINT16:
#endif
-
+
case FFI_TYPE_SINT64:
case FFI_TYPE_FLOAT:
case FFI_TYPE_DOUBLE:
case FFI_TYPE_LONGDOUBLE:
cif->flags = (unsigned) cif->rtype->type;
break;
-
+
case FFI_TYPE_UINT64:
cif->flags = FFI_TYPE_SINT64;
break;
-
+
#ifndef X86
case FFI_TYPE_STRUCT:
if (cif->rtype->size == 1)
@@ -163,16 +163,16 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
}
break;
#endif
-
+
default:
cif->flags = FFI_TYPE_INT;
break;
}
-
+
#ifdef X86_DARWIN
cif->bytes = (cif->bytes + 15) & ~0xF;
#endif
-
+
return FFI_OK;
}
@@ -188,23 +188,23 @@ extern void ffi_call_STDCALL(void (*)(char *, extended_cif *), extended_cif *,
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue)
{
extended_cif ecif;
-
+
ecif.cif = cif;
ecif.avalue = avalue;
-
+
/* If the return value is a struct and we don't have a return */
/* value address then we need to make one */
-
- if ((rvalue == NULL) &&
+
+ if ((rvalue == NULL) &&
(cif->flags == FFI_TYPE_STRUCT))
{
ecif.rvalue = alloca(cif->rtype->size);
}
else
ecif.rvalue = rvalue;
-
-
- switch (cif->abi)
+
+
+ switch (cif->abi)
{
case FFI_SYSV:
ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue,
@@ -245,20 +245,20 @@ void *args;
// our various things...
ffi_cif *cif;
void **arg_area;
-
+
cif = closure->cif;
- arg_area = (void**) alloca (cif->nargs * sizeof (void*));
-
+ arg_area = (void**) alloca (cif->nargs * sizeof (void*));
+
/* this call will initialize ARG_AREA, such that each
- * element in that array points to the corresponding
+ * element in that array points to the corresponding
* value on the stack; and if the function returns
* a structure, it will re-set RESP to point to the
* structure return address. */
-
+
ffi_prep_incoming_args_SYSV(args, respp, arg_area, cif);
-
+
(closure->fun) (cif, *respp, arg_area, closure->user_data);
-
+
return cif->flags;
}
@@ -270,35 +270,35 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, void **avalue,
register void **p_argv;
register char *argp;
register ffi_type **p_arg;
-
+
argp = stack;
-
+
if ( cif->flags == FFI_TYPE_STRUCT ) {
*rvalue = *(void **) argp;
argp += 4;
}
-
+
p_argv = avalue;
-
+
for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++)
{
size_t z;
-
+
/* Align if necessary */
if ((sizeof(int) - 1) & (unsigned) argp) {
argp = (char *) ALIGN(argp, sizeof(int));
}
-
+
z = (*p_arg)->size;
-
+
/* because we're little endian, this is what it turns into. */
-
+
*p_argv = (void*) argp;
-
+
p_argv++;
argp += z;
}
-
+
return;
}
@@ -325,15 +325,15 @@ ffi_prep_closure (ffi_closure* closure,
{
if (cif->abi != FFI_SYSV)
return FFI_BAD_ABI;
-
+
FFI_INIT_TRAMPOLINE (&closure->tramp[0], \
&ffi_closure_SYSV, \
(void*)closure);
-
+
closure->cif = cif;
closure->user_data = user_data;
closure->fun = fun;
-
+
return FFI_OK;
}
@@ -349,32 +349,32 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure,
void *codeloc)
{
int i;
-
+
FFI_ASSERT (cif->abi == FFI_SYSV);
-
+
// we currently don't support certain kinds of arguments for raw
// closures. This should be implemented by a separate assembly language
// routine, since it would require argument processing, something we
// don't do now for performance.
-
+
for (i = cif->nargs-1; i >= 0; i--)
{
FFI_ASSERT (cif->arg_types[i]->type != FFI_TYPE_STRUCT);
FFI_ASSERT (cif->arg_types[i]->type != FFI_TYPE_LONGDOUBLE);
}
-
-
+
+
FFI_INIT_TRAMPOLINE (&closure->tramp[0], &ffi_closure_raw_SYSV,
codeloc);
-
+
closure->cif = cif;
closure->user_data = user_data;
closure->fun = fun;
-
+
return FFI_OK;
}
-static void
+static void
ffi_prep_args_raw(char *stack, extended_cif *ecif)
{
memcpy (stack, ecif->avalue, ecif->cif->bytes);
@@ -386,7 +386,7 @@ ffi_prep_args_raw(char *stack, extended_cif *ecif)
*/
extern void
-ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, unsigned,
+ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, unsigned,
unsigned, unsigned *, void (*fn)());
#ifdef X86_WIN32
@@ -400,23 +400,23 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(), void *rvalue, ffi_raw *fake_avalue)
{
extended_cif ecif;
void **avalue = (void **)fake_avalue;
-
+
ecif.cif = cif;
ecif.avalue = avalue;
-
+
/* If the return value is a struct and we don't have a return */
/* value address then we need to make one */
-
- if ((rvalue == NULL) &&
+
+ if ((rvalue == NULL) &&
(cif->rtype->type == FFI_TYPE_STRUCT))
{
ecif.rvalue = alloca(cif->rtype->size);
}
else
ecif.rvalue = rvalue;
-
-
- switch (cif->abi)
+
+
+ switch (cif->abi)
{
case FFI_SYSV:
ffi_call_SYSV(ffi_prep_args_raw, &ecif, cif->bytes, cif->flags,
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index a7b2e984310d1..aa877174417cd 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -59,7 +59,7 @@ PyDoc_STRVAR(module_doc,
" I/O classes. open() uses the file's blksize (as obtained by os.stat) if\n"
" possible.\n"
);
-
+
/*
* The main open() function
@@ -512,7 +512,7 @@ _io_open_code_impl(PyObject *module, PyObject *path)
{
return PyFile_OpenCodeObject(path);
}
-
+
/*
* Private helpers for the io module.
*/
diff --git a/Modules/termios.c b/Modules/termios.c
index fcc8f04267987..3900a6f0b8986 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -85,7 +85,7 @@ termios_tcgetattr_impl(PyObject *module, int fd)
int r;
Py_BEGIN_ALLOW_THREADS
- r = tcgetattr(fd, &mode);
+ r = tcgetattr(fd, &mode);
Py_END_ALLOW_THREADS
if (r == -1) {
return PyErr_SetFromErrno(state->TermiosError);
@@ -372,7 +372,7 @@ termios_tcgetwinsize_impl(PyObject *module, int fd)
#if defined(TIOCGWINSZ)
termiosmodulestate *state = PyModule_GetState(module);
struct winsize w;
- int r;
+ int r;
Py_BEGIN_ALLOW_THREADS
r = ioctl(fd, TIOCGWINSZ, &w);
diff --git a/PC/winreg.c b/PC/winreg.c
index f668cf3c19cab..940278194f4cf 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -564,7 +564,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
{
Py_ssize_t i,j;
switch (typ) {
- case REG_DWORD:
+ case REG_DWORD:
{
if (value != Py_None && !PyLong_Check(value)) {
return FALSE;
@@ -588,7 +588,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
*retDataSize = sizeof(DWORD);
break;
}
- case REG_QWORD:
+ case REG_QWORD:
{
if (value != Py_None && !PyLong_Check(value)) {
return FALSE;
diff --git a/Tools/msi/bundle/bootstrap/pch.h b/Tools/msi/bundle/bootstrap/pch.h
index b0aa5111dabd0..6d0974b34c61e 100644
--- a/Tools/msi/bundle/bootstrap/pch.h
+++ b/Tools/msi/bundle/bootstrap/pch.h
@@ -5,7 +5,7 @@
// The license and further copyright text can be found in the file
// LICENSE.TXT at the root directory of the distribution.
// </copyright>
-//
+//
// <summary>
// Precompiled header for standard bootstrapper application.
// </summary>
diff --git a/Tools/msi/bundle/bootstrap/resource.h b/Tools/msi/bundle/bootstrap/resource.h
index 53c03c319f091..d951e651f6d20 100644
--- a/Tools/msi/bundle/bootstrap/resource.h
+++ b/Tools/msi/bundle/bootstrap/resource.h
@@ -14,7 +14,7 @@
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
More information about the Python-checkins
mailing list