mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-10 06:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 78901 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78901 | ezio.melotti | 2010-03-13 06:42:07 +0200 (Sat, 13 Mar 2010) | 9 lines

  Merged revisions 78900 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78900 | ezio.melotti | 2010-03-13 06:39:51 +0200 (Sat, 13 Mar 2010) | 1 line

    Silence compiler warnings.
  ........
................
This commit is contained in:
Ezio Melotti 2010-03-23 15:56:12 +00:00
parent d526c7cc1c
commit 6de9bec392
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/_cursesmodule.c
View file

@ -458,14 +458,14 @@ PyCursesWindow_AddStr(PyCursesWindowObject *self, PyObject *args)
if (use_attr == TRUE) { if (use_attr == TRUE) {
attr_old = getattrs(self->win); attr_old = getattrs(self->win);
wattrset(self->win,attr); (void)wattrset(self->win,attr);
} }
if (use_xy == TRUE) if (use_xy == TRUE)
rtn = mvwaddstr(self->win,y,x,str); rtn = mvwaddstr(self->win,y,x,str);
else else
rtn = waddstr(self->win,str); rtn = waddstr(self->win,str);
if (use_attr == TRUE) if (use_attr == TRUE)
wattrset(self->win,attr_old); (void)wattrset(self->win,attr_old);
return PyCursesCheckERR(rtn, "addstr"); return PyCursesCheckERR(rtn, "addstr");
} }
@ -507,14 +507,14 @@ PyCursesWindow_AddNStr(PyCursesWindowObject *self, PyObject *args)
if (use_attr == TRUE) { if (use_attr == TRUE) {
attr_old = getattrs(self->win); attr_old = getattrs(self->win);
wattrset(self->win,attr); (void)wattrset(self->win,attr);
} }
if (use_xy == TRUE) if (use_xy == TRUE)
rtn = mvwaddnstr(self->win,y,x,str,n); rtn = mvwaddnstr(self->win,y,x,str,n);
else else
rtn = waddnstr(self->win,str,n); rtn = waddnstr(self->win,str,n);
if (use_attr == TRUE) if (use_attr == TRUE)
wattrset(self->win,attr_old); (void)wattrset(self->win,attr_old);
return PyCursesCheckERR(rtn, "addnstr"); return PyCursesCheckERR(rtn, "addnstr");
} }
@ -1148,14 +1148,14 @@ PyCursesWindow_InsStr(PyCursesWindowObject *self, PyObject *args)
if (use_attr == TRUE) { if (use_attr == TRUE) {
attr_old = getattrs(self->win); attr_old = getattrs(self->win);
wattrset(self->win,attr); (void)wattrset(self->win,attr);
} }
if (use_xy == TRUE) if (use_xy == TRUE)
rtn = mvwinsstr(self->win,y,x,str); rtn = mvwinsstr(self->win,y,x,str);
else else
rtn = winsstr(self->win,str); rtn = winsstr(self->win,str);
if (use_attr == TRUE) if (use_attr == TRUE)
wattrset(self->win,attr_old); (void)wattrset(self->win,attr_old);
return PyCursesCheckERR(rtn, "insstr"); return PyCursesCheckERR(rtn, "insstr");
} }
@ -1197,14 +1197,14 @@ PyCursesWindow_InsNStr(PyCursesWindowObject *self, PyObject *args)
if (use_attr == TRUE) { if (use_attr == TRUE) {
attr_old = getattrs(self->win); attr_old = getattrs(self->win);
wattrset(self->win,attr); (void)wattrset(self->win,attr);
} }
if (use_xy == TRUE) if (use_xy == TRUE)
rtn = mvwinsnstr(self->win,y,x,str,n); rtn = mvwinsnstr(self->win,y,x,str,n);
else else
rtn = winsnstr(self->win,str,n); rtn = winsnstr(self->win,str,n);
if (use_attr == TRUE) if (use_attr == TRUE)
wattrset(self->win,attr_old); (void)wattrset(self->win,attr_old);
return PyCursesCheckERR(rtn, "insnstr"); return PyCursesCheckERR(rtn, "insnstr");
} }