diff options
| -rw-r--r-- | Modules/_tracemalloc.c | 1 | ||||
| -rw-r--r-- | Modules/getpath.c | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 6 | ||||
| -rw-r--r-- | Modules/syslogmodule.c | 2 | ||||
| -rw-r--r-- | Objects/exceptions.c | 8 | ||||
| -rw-r--r-- | PC/getpathp.c | 6 | ||||
| -rw-r--r-- | Python/fileutils.c | 2 | ||||
| -rw-r--r-- | Python/import.c | 1 | ||||
| -rw-r--r-- | Python/pathconfig.c | 2 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 1 | ||||
| -rw-r--r-- | Python/pythonrun.c | 1 | ||||
| -rw-r--r-- | Python/sysmodule.c | 4 | ||||
| -rw-r--r-- | Python/traceback.c | 2 |
13 files changed, 18 insertions, 20 deletions
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index 691de07..dbae107 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -4,7 +4,6 @@ #include "pycore_traceback.h" #include "hashtable.h" #include "frameobject.h" -#include "osdefs.h" #include "clinic/_tracemalloc.c.h" /*[clinic input] diff --git a/Modules/getpath.c b/Modules/getpath.c index 1dd8dd0..94e06b3 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -4,7 +4,7 @@ #include "pycore_fileutils.h" #include "pycore_initconfig.h" #include "pycore_pathconfig.h" -#include "osdefs.h" +#include "osdefs.h" // DELIM #include <sys/types.h> #include <string.h> diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index f5beb09..89f9757 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -312,11 +312,11 @@ extern char *ctermid_r(char *); #ifndef IO_REPARSE_TAG_MOUNT_POINT #define IO_REPARSE_TAG_MOUNT_POINT (0xA0000003L) #endif -#include "osdefs.h" +#include "osdefs.h" // SEP #include <malloc.h> #include <windows.h> -#include <shellapi.h> /* for ShellExecute() */ -#include <lmcons.h> /* for UNLEN */ +#include <shellapi.h> // ShellExecute() +#include <lmcons.h> // UNLEN #define HAVE_SYMLINK #endif /* _MSC_VER */ diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index 2451792..11718e2 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -50,7 +50,7 @@ Revision history: /* syslog module */ #include "Python.h" -#include "osdefs.h" +#include "osdefs.h" // SEP #include <syslog.h> diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 69a6b5c..ca917b4 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -9,7 +9,7 @@ #include "pycore_initconfig.h" #include "pycore_object.h" #include "structmember.h" // PyMemberDef -#include "osdefs.h" +#include "osdefs.h" // SEP /* Compatibility aliases */ @@ -1435,11 +1435,13 @@ my_basename(PyObject *name) size = PyUnicode_GET_LENGTH(name); offset = 0; for(i=0; i < size; i++) { - if (PyUnicode_READ(kind, data, i) == SEP) + if (PyUnicode_READ(kind, data, i) == SEP) { offset = i + 1; + } } - if (offset != 0) + if (offset != 0) { return PyUnicode_Substring(name, offset, size); + } else { Py_INCREF(name); return name; diff --git a/PC/getpathp.c b/PC/getpathp.c index 24a9323..d23d2bb 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -80,9 +80,9 @@ #include "Python.h" -#include "pycore_initconfig.h" /* PyStatus */ -#include "pycore_pathconfig.h" /* _PyPathConfig */ -#include "osdefs.h" +#include "pycore_initconfig.h" // PyStatus +#include "pycore_pathconfig.h" // _PyPathConfig +#include "osdefs.h" // SEP, ALTSEP #include <wchar.h> #ifndef MS_WINDOWS diff --git a/Python/fileutils.c b/Python/fileutils.c index 19ead9d..439bc35 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,6 +1,6 @@ #include "Python.h" #include "pycore_fileutils.h" -#include "osdefs.h" +#include "osdefs.h" // SEP #include <locale.h> #ifdef MS_WINDOWS diff --git a/Python/import.c b/Python/import.c index a2aa4af..a874345 100644 --- a/Python/import.c +++ b/Python/import.c @@ -16,7 +16,6 @@ #include "marshal.h" #include "code.h" #include "frameobject.h" -#include "osdefs.h" #include "importdl.h" #include "pydtrace.h" diff --git a/Python/pathconfig.c b/Python/pathconfig.c index 6ebfdac..fe3ac3e 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -1,7 +1,7 @@ /* Path configuration like module_search_path (sys.path) */ #include "Python.h" -#include "osdefs.h" +#include "osdefs.h" // DELIM #include "pycore_initconfig.h" #include "pycore_fileutils.h" #include "pycore_pathconfig.h" diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 9c13274..688ee0c 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -26,7 +26,6 @@ #include "symtable.h" #include "ast.h" #include "marshal.h" -#include "osdefs.h" #include <locale.h> #ifdef HAVE_SIGNAL_H diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 2466699..d6bc883 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -27,7 +27,6 @@ #include "symtable.h" #include "ast.h" #include "marshal.h" -#include "osdefs.h" #include <locale.h> #ifdef HAVE_SIGNAL_H diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 4e67325..92ea5e7 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -26,9 +26,9 @@ Data members: #include "pycore_pymem.h" // _PyMem_SetDefaultAllocator() #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_tupleobject.h" -#include "pydtrace.h" -#include "osdefs.h" +#include "pydtrace.h" +#include "osdefs.h" // DELIM #include <locale.h> #ifdef MS_WINDOWS diff --git a/Python/traceback.c b/Python/traceback.c index e3397ec..85e9124 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -6,7 +6,7 @@ #include "code.h" #include "frameobject.h" #include "structmember.h" // PyMemberDef -#include "osdefs.h" +#include "osdefs.h" // SEP #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif |