@@ -392,8 +392,9 @@ PyCursesCheckERR_From(PyObject *module, int code,
392392 return NULL ;
393393}
394394
395- static PyObject * PyCursesCheckERR_ForWin_From (PyCursesWindowObject * , int ,
396- const char * , const char * );
395+ static PyObject *
396+ PyCursesCheckERR_ForWin_From (PyCursesWindowObject * , int ,
397+ const char * , const char * );
397398
398399static inline PyObject *
399400PyCursesCheckERR_ForWin (PyCursesWindowObject * win , int code ,
@@ -1189,11 +1190,11 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
11891190 const char * str = PyBytes_AS_STRING (bytesobj );
11901191 simple_funcname = "addnstr" ;
11911192 if (use_xy ) {
1192- rtn = mvwaddnstr (self -> win , y , x , str , n );
1193+ rtn = mvwaddnstr (self -> win ,y , x , str ,n );
11931194 curses_funcname = "mvwaddnstr" ;
11941195 }
11951196 else {
1196- rtn = waddnstr (self -> win , str , n );
1197+ rtn = waddnstr (self -> win ,str ,n );
11971198 curses_funcname = "waddnstr" ;
11981199 }
11991200 Py_DECREF (bytesobj );
@@ -1501,13 +1502,13 @@ PyCursesWindow_ChgAt(PyObject *op, PyObject *args)
15011502
15021503 if (use_xy ) {
15031504 rtn = mvwchgat (self -> win ,y ,x ,num ,attr ,color ,NULL );
1504- curses_funcname = "mvwchgat" ;
15051505 (void )touchline (self -> win ,y ,1 );
1506+ curses_funcname = "mvwchgat" ;
15061507 } else {
15071508 getyx (self -> win ,y ,x );
15081509 rtn = wchgat (self -> win ,num ,attr ,color ,NULL );
1509- curses_funcname = "wchgat" ;
15101510 (void )touchline (self -> win ,y ,1 );
1511+ curses_funcname = "wchgat" ;
15111512 }
15121513 return PyCursesCheckERR_ForWin_From (self , rtn , "chgat" , curses_funcname );
15131514}
@@ -2140,26 +2141,26 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
21402141 if (strtype == 2 ) {
21412142 simple_funcname = "inswstr" ;
21422143 if (use_xy ) {
2143- rtn = mvwins_wstr (self -> win , y , x , wstr );
2144+ rtn = mvwins_wstr (self -> win ,y , x , wstr );
21442145 curses_funcname = "mvwins_wstr" ;
21452146 }
21462147 else {
2147- rtn = wins_wstr (self -> win , wstr );
2148+ rtn = wins_wstr (self -> win ,wstr );
21482149 curses_funcname = "wins_wstr" ;
21492150 }
21502151 PyMem_Free (wstr );
21512152 }
21522153 else
21532154#endif
21542155 {
2155- const char * text = PyBytes_AS_STRING (bytesobj );
2156+ const char * str = PyBytes_AS_STRING (bytesobj );
21562157 simple_funcname = "insstr" ;
21572158 if (use_xy ) {
2158- rtn = mvwinsstr (self -> win , y , x , text );
2159+ rtn = mvwinsstr (self -> win ,y , x , str );
21592160 curses_funcname = "mvwinsstr" ;
21602161 }
21612162 else {
2162- rtn = winsstr (self -> win , text );
2163+ rtn = winsstr (self -> win ,str );
21632164 curses_funcname = "winsstr" ;
21642165 }
21652166 Py_DECREF (bytesobj );
@@ -2235,26 +2236,26 @@ _curses_window_insnstr_impl(PyCursesWindowObject *self, int group_left_1,
22352236 if (strtype == 2 ) {
22362237 simple_funcname = "insn_wstr" ;
22372238 if (use_xy ) {
2238- rtn = mvwins_nwstr (self -> win , y , x , wstr , n );
2239+ rtn = mvwins_nwstr (self -> win ,y , x , wstr ,n );
22392240 curses_funcname = "mvwins_nwstr" ;
22402241 }
22412242 else {
2242- rtn = wins_nwstr (self -> win , wstr , n );
2243+ rtn = wins_nwstr (self -> win ,wstr ,n );
22432244 curses_funcname = "wins_nwstr" ;
22442245 }
22452246 PyMem_Free (wstr );
22462247 }
22472248 else
22482249#endif
22492250 {
2250- const char * text = PyBytes_AS_STRING (bytesobj );
2251+ const char * str = PyBytes_AS_STRING (bytesobj );
22512252 simple_funcname = "insnstr" ;
22522253 if (use_xy ) {
2253- rtn = mvwinsnstr (self -> win , y , x , text , n );
2254+ rtn = mvwinsnstr (self -> win ,y , x , str , n );
22542255 curses_funcname = "mvwinsnstr" ;
22552256 }
22562257 else {
2257- rtn = winsnstr (self -> win , text , n );
2258+ rtn = winsnstr (self -> win ,str , n );
22582259 curses_funcname = "winsnstr" ;
22592260 }
22602261 Py_DECREF (bytesobj );
0 commit comments