Skip to content

Commit 5b8ff99

Browse files
committed
simplify logic x3
1 parent 4d8f47f commit 5b8ff99

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Modules/_cursesmodule.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ _PyCursesSetError(cursesmodule_state *state,
243243
else if (curses_funcname == NULL) {
244244
PyErr_Format(state->error, CURSES_ERROR_FORMAT, simple_funcname);
245245
}
246-
else if (strcmp(simple_funcname, curses_funcname) == 0) {
247-
PyErr_Format(state->error, CURSES_ERROR_FORMAT, simple_funcname);
248-
}
249246
else {
250247
PyErr_Format(state->error, CURSES_ERROR_VERBOSE_FORMAT,
251248
curses_funcname, simple_funcname);
@@ -262,7 +259,7 @@ PyCursesSetError_From(PyObject *, const char *, const char *);
262259
static inline void
263260
PyCursesSetError(PyObject *module, const char *funcname)
264261
{
265-
PyCursesSetError_From(module, funcname, funcname);
262+
PyCursesSetError_From(module, funcname, NULL);
266263
}
267264

268265
static void
@@ -281,7 +278,7 @@ PyCursesSetError_ForWin_From(PyCursesWindowObject *,
281278
static inline void
282279
PyCursesSetError_ForWin(PyCursesWindowObject *win, const char *funcname)
283280
{
284-
PyCursesSetError_ForWin_From(win, funcname, funcname);
281+
PyCursesSetError_ForWin_From(win, funcname, NULL);
285282
}
286283

287284
static void
@@ -374,13 +371,13 @@ _PyCursesStatefulCheckFunction(PyObject *module, int called, const char *funcnam
374371
* on success and setting an exception on error.
375372
*/
376373

377-
static PyObject *PyCursesCheckERR_From(PyObject *, int,
378-
const char *, const char *);
374+
static PyObject *
375+
PyCursesCheckERR_From(PyObject *, int, const char *, const char *);
379376

380377
static inline PyObject *
381378
PyCursesCheckERR(PyObject *module, int code, const char *funcname)
382379
{
383-
return PyCursesCheckERR_From(module, code, funcname, funcname);
380+
return PyCursesCheckERR_From(module, code, funcname, NULL);
384381
}
385382

386383
static PyObject *
@@ -402,7 +399,7 @@ static inline PyObject *
402399
PyCursesCheckERR_ForWin(PyCursesWindowObject *win, int code,
403400
const char *funcname)
404401
{
405-
return PyCursesCheckERR_ForWin_From(win, code, funcname, funcname);
402+
return PyCursesCheckERR_ForWin_From(win, code, funcname, NULL);
406403
}
407404

408405
static PyObject *

0 commit comments

Comments
 (0)