Skip to content

gh-123961: add curses prefix to global variable names in _cursesmodule.c #124047

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
merged 4 commits into from
Sep 13, 2024
Merged

gh-123961: add curses prefix to global variable names in _cursesmodule.c #124047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e222e3b
rename global variables
picnixz Sep 13, 2024
b805515
update global names
picnixz Sep 13, 2024
9799734
use a `const char*` instead of a `const *` for the encoding name
picnixz Sep 13, 2024
e6e3793
fix missing TAB
picnixz Sep 13, 2024
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
28 changes: 14 additions & 14 deletions Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,20 @@ class _curses.window "PyCursesWindowObject *" "&PyCursesWindow_Type"
static PyObject *PyCursesError;

/* Tells whether setupterm() has been called to initialise terminfo. */
static int initialised_setupterm = FALSE;
static int curses_setupterm_called = FALSE;

/* Tells whether initscr() has been called to initialise curses. */
static int initialised = FALSE;
static int curses_initscr_called = FALSE;

/* Tells whether start_color() has been called to initialise color usage. */
static int initialisedcolors = FALSE;
static int curses_start_color_called = FALSE;

static char *screen_encoding = NULL;
static const char *curses_screen_encoding = NULL;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no new compiler warning, so changing type from char* to const char* looks safe.


/* Utility Macros */
#define PyCursesSetupTermCalled \
do { \
if (initialised_setupterm != TRUE) { \
if (curses_setupterm_called != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call (at least) setupterm() first"); \
return 0; \
Expand All @@ -192,7 +192,7 @@ static char *screen_encoding = NULL;

#define PyCursesInitialised \
do { \
if (initialised != TRUE) { \
if (curses_initscr_called != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call initscr() first"); \
return 0; \
Expand All @@ -201,7 +201,7 @@ static char *screen_encoding = NULL;

#define PyCursesInitialisedColor \
do { \
if (initialisedcolors != TRUE) { \
if (curses_start_color_called != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call start_color() first"); \
return 0; \
Expand Down Expand Up @@ -267,7 +267,7 @@ PyCurses_ConvertToChtype(PyCursesWindowObject *win, PyObject *obj, chtype *ch)
if (win)
encoding = win->encoding;
else
encoding = screen_encoding;
encoding = curses_screen_encoding;
bytes = PyUnicode_AsEncodedString(obj, encoding, NULL);
if (bytes == NULL)
return 0;
Expand Down Expand Up @@ -3278,7 +3278,7 @@ _curses_initscr_impl(PyObject *module)
{
WINDOW *win;

if (initialised) {
if (curses_initscr_called) {
wrefresh(stdscr);
return (PyObject *)PyCursesWindow_New(stdscr, NULL);
}
Expand All @@ -3290,7 +3290,7 @@ _curses_initscr_impl(PyObject *module)
return NULL;
}

initialised = initialised_setupterm = TRUE;
curses_initscr_called = curses_setupterm_called = TRUE;

PyObject *module_dict = PyModule_GetDict(module); // borrowed
if (module_dict == NULL) {
Expand Down Expand Up @@ -3386,7 +3386,7 @@ _curses_initscr_impl(PyObject *module)
if (winobj == NULL) {
return NULL;
}
screen_encoding = winobj->encoding;
curses_screen_encoding = winobj->encoding;
return (PyObject *)winobj;
}

Expand Down Expand Up @@ -3428,7 +3428,7 @@ _curses_setupterm_impl(PyObject *module, const char *term, int fd)
}
}

if (!initialised_setupterm && setupterm((char *)term, fd, &err) == ERR) {
if (!curses_setupterm_called && setupterm((char *)term, fd, &err) == ERR) {
const char* s = "setupterm: unknown error";

if (err == 0) {
Expand All @@ -3441,7 +3441,7 @@ _curses_setupterm_impl(PyObject *module, const char *term, int fd)
return NULL;
}

initialised_setupterm = TRUE;
curses_setupterm_called = TRUE;

Py_RETURN_NONE;
}
Expand Down Expand Up @@ -4245,7 +4245,7 @@ _curses_start_color_impl(PyObject *module)
return NULL;
}

initialisedcolors = TRUE;
curses_start_color_called = TRUE;

PyObject *module_dict = PyModule_GetDict(module); // borrowed
if (module_dict == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@ Modules/_tkinter.c - trbInCmd -
Include/datetime.h - PyDateTimeAPI -
Modules/_ctypes/cfield.c _ctypes_get_fielddesc initialized -
Modules/_ctypes/malloc_closure.c - _pagesize -
Modules/_cursesmodule.c - initialised -
Modules/_cursesmodule.c - initialised_setupterm -
Modules/_cursesmodule.c - initialisedcolors -
Modules/_cursesmodule.c - screen_encoding -
Modules/_cursesmodule.c - curses_initscr_called -
Modules/_cursesmodule.c - curses_setupterm_called -
Modules/_cursesmodule.c - curses_start_color_called -
Modules/_cursesmodule.c - curses_screen_encoding -
Modules/_elementtree.c - expat_capi -
Modules/readline.c - libedit_append_replace_history_offset -
Modules/readline.c - using_libedit_emulation -
Expand Down
Loading