[Python-checkins] CVS: python/dist/src/Modules _curses_panel.c,1.2,1.3

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv18355/Modules

Modified Files:
	_curses_panel.c 
Log Message:

Shortened / wrapped some long lines.
Removed warning on use of panel_userptr() in PyCursesPanel_userptr().


Index: _curses_panel.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_curses_panel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** _curses_panel.c	2000/12/22 22:03:15	1.2
--- _curses_panel.c	2000/12/23 05:46:23	1.3
***************
*** 142,156 ****
  
  #define Panel_NoArgNoReturnFunction(X) \
! static PyObject *PyCursesPanel_ ## X (PyCursesPanelObject *self, PyObject *args) \
  { if (!PyArg_NoArgs(args)) return NULL; \
    return PyCursesCheckERR(X(self->pan), # X); }
  
  #define Panel_NoArgReturnStringFunction(X) \
! static PyObject *PyCursesPanel_ ## X (PyCursesPanelObject *self, PyObject *args) \
  { if (!PyArg_NoArgs(args)) return NULL; \
    return PyString_FromString(X(self->pan)); }
  
  #define Panel_NoArgTrueFalseFunction(X) \
! static PyObject * PyCursesPanel_ ## X (PyCursesPanelObject *self, PyObject *args) \
  { \
    if (!PyArg_NoArgs(args)) return NULL; \
--- 142,156 ----
  
  #define Panel_NoArgNoReturnFunction(X) \
! static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *args) \
  { if (!PyArg_NoArgs(args)) return NULL; \
    return PyCursesCheckERR(X(self->pan), # X); }
  
  #define Panel_NoArgReturnStringFunction(X) \
! static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *args) \
  { if (!PyArg_NoArgs(args)) return NULL; \
    return PyString_FromString(X(self->pan)); }
  
  #define Panel_NoArgTrueFalseFunction(X) \
! static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *args) \
  { \
    if (!PyArg_NoArgs(args)) return NULL; \
***************
*** 159,163 ****
  
  #define Panel_TwoArgNoReturnFunction(X, TYPE, PARSESTR) \
! static PyObject * PyCursesPanel_ ## X (PyCursesPanelObject *self, PyObject *args) \
  { \
    TYPE arg1, arg2; \
--- 159,163 ----
  
  #define Panel_TwoArgNoReturnFunction(X, TYPE, PARSESTR) \
! static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *args) \
  { \
    TYPE arg1, arg2; \
***************
*** 310,314 ****
      obj = PyTuple_GetItem(args, 0);
      Py_INCREF(obj);
!     return PyCursesCheckERR(set_panel_userptr(self->pan, obj), "set_panel_userptr");
  }
  
--- 310,315 ----
      obj = PyTuple_GetItem(args, 0);
      Py_INCREF(obj);
!     return PyCursesCheckERR(set_panel_userptr(self->pan, obj),
!                             "set_panel_userptr");
  }
  
***************
*** 318,323 ****
      PyObject *obj;
      PyCursesInitialised; 
! 	if (!PyArg_NoArgs(args)) return NULL;
!     obj = panel_userptr(self->pan);
      Py_INCREF(obj);
      return obj;
--- 319,325 ----
      PyObject *obj;
      PyCursesInitialised; 
!     if (!PyArg_NoArgs(args))
!         return NULL;
!     obj = (PyObject *) panel_userptr(self->pan);
      Py_INCREF(obj);
      return obj;
***************
*** 409,413 ****
      PANEL *pan;
  
!     if (!PyArg_ParseTuple(args, "O!", &PyCursesWindow_Type, &win)) return NULL;
      pan = new_panel(win->win);
      if (pan == NULL) {
--- 411,416 ----
      PANEL *pan;
  
!     if (!PyArg_ParseTuple(args, "O!", &PyCursesWindow_Type, &win))
!         return NULL;
      pan = new_panel(win->win);
      if (pan == NULL) {