Skip to content

bpo-40268: Remove unused osdefs.h includes #19532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Apr 15, 2020
Merged

bpo-40268: Remove unused osdefs.h includes #19532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Modules/_tracemalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "pycore_traceback.h"
#include "hashtable.h"
#include "frameobject.h"
#include "osdefs.h"

#include "clinic/_tracemalloc.c.h"
/*[clinic input]
Expand Down
2 changes: 1 addition & 1 deletion Modules/getpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion Modules/syslogmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Revision history:
/* syslog module */

#include "Python.h"
#include "osdefs.h"
#include "osdefs.h" // SEP

#include <syslog.h>

Expand Down
8 changes: 5 additions & 3 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions PC/getpathp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Python.h"
#include "pycore_fileutils.h"
#include "osdefs.h"
#include "osdefs.h" // SEP
#include <locale.h>

#ifdef MS_WINDOWS
Expand Down
1 change: 0 additions & 1 deletion Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "marshal.h"
#include "code.h"
#include "frameobject.h"
#include "osdefs.h"
#include "importdl.h"
#include "pydtrace.h"

Expand Down
2 changes: 1 addition & 1 deletion Python/pathconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 0 additions & 1 deletion Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "symtable.h"
#include "ast.h"
#include "marshal.h"
#include "osdefs.h"
#include <locale.h>

#ifdef HAVE_SIGNAL_H
Expand Down
1 change: 0 additions & 1 deletion Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "symtable.h"
#include "ast.h"
#include "marshal.h"
#include "osdefs.h"
#include <locale.h>

#ifdef HAVE_SIGNAL_H
Expand Down
4 changes: 2 additions & 2 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down