Merged revisions 81073 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81073 | andrew.kuchling | 2010-05-10 19:27:01 -0400 (Mon, 10 May 2010) | 1 line

  Use ';' after initialization macros to avoid confusing re-indenters
........

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index c4561bd38b20e9efab747f0c24394e419515777b..442c3f1d434d5fb9afe6be84c21cba233c48f3a4 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1748,8 +1748,8 @@ PyCurses_Color_Content(PyObject *self, PyObject *args)
 {
   short color,r,g,b;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   if (!PyArg_ParseTuple(args, "h:color_content", &color)) return NULL;
 
@@ -1767,8 +1767,8 @@ PyCurses_color_pair(PyObject *self, PyObject *args)
 {
   int n;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   if (!PyArg_ParseTuple(args, "i:color_pair", &n)) return NULL;
   return PyLong_FromLong((long) (n << 8));
@@ -1779,7 +1779,7 @@ PyCurses_Curs_Set(PyObject *self, PyObject *args)
 {
   int vis,erg;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args, "i:curs_set", &vis)) return NULL;
 
@@ -1794,7 +1794,7 @@ PyCurses_Delay_Output(PyObject *self, PyObject *args)
 {
   int ms;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args, "i:delay_output", &ms)) return NULL;
 
@@ -1806,7 +1806,7 @@ PyCurses_EraseChar(PyObject *self)
 {
   char ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   ch = erasechar();
 
@@ -1819,7 +1819,7 @@ PyCurses_getsyx(PyObject *self)
   int x = 0;
   int y = 0;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   getsyx(y, x);
 
@@ -1833,7 +1833,7 @@ PyCurses_GetMouse(PyObject *self)
        int rtn;
        MEVENT event;
 
-       PyCursesInitialised
+       PyCursesInitialised;
 
        rtn = getmouse( &event );
        if (rtn == ERR) {
@@ -1851,7 +1851,7 @@ PyCurses_UngetMouse(PyObject *self, PyObject *args)
 {
        MEVENT event;
 
-       PyCursesInitialised
+       PyCursesInitialised;
        if (!PyArg_ParseTuple(args, "hiiil",
                             &event.id, 
                             &event.x, &event.y, &event.z,
@@ -1872,7 +1872,7 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream)
   size_t datalen;
   WINDOW *win;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   strcpy(fn, "/tmp/py.curses.getwin.XXXXXX");
   fd = mkstemp(fn);
@@ -1923,7 +1923,7 @@ PyCurses_HalfDelay(PyObject *self, PyObject *args)
 {
   unsigned char tenths;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args, "b:halfdelay", &tenths)) return NULL;
 
@@ -1936,7 +1936,7 @@ static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
 {
   int ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
 
@@ -1954,8 +1954,8 @@ PyCurses_Init_Color(PyObject *self, PyObject *args)
 {
   short color, r, g, b;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   switch(PyTuple_Size(args)) {
   case 4:
@@ -1974,8 +1974,8 @@ PyCurses_Init_Pair(PyObject *self, PyObject *args)
 {
   short pair, f, b;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   if (PyTuple_Size(args) != 3) {
     PyErr_SetString(PyExc_TypeError, "init_pair requires 3 arguments");
@@ -2148,7 +2148,7 @@ PyCurses_IntrFlush(PyObject *self, PyObject *args)
 {
   int ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   switch(PyTuple_Size(args)) {
   case 1:
@@ -2170,7 +2170,7 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *args)
   int columns;
   int result;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"ii:is_term_resized", &lines, &columns))
     return NULL;
@@ -2192,7 +2192,7 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
   const char *knp;
   int ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
 
@@ -2221,7 +2221,7 @@ PyCurses_Meta(PyObject *self, PyObject *args)
 {
   int ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   switch(PyTuple_Size(args)) {
   case 1:
@@ -2240,7 +2240,7 @@ static PyObject *
 PyCurses_MouseInterval(PyObject *self, PyObject *args)
 {
        int interval;
-       PyCursesInitialised 
+       PyCursesInitialised;
 
        if (!PyArg_ParseTuple(args,"i;interval",&interval)) 
                return NULL;
@@ -2253,7 +2253,7 @@ PyCurses_MouseMask(PyObject *self, PyObject *args)
        int newmask;
        mmask_t oldmask, availmask;
 
-       PyCursesInitialised 
+       PyCursesInitialised;
        if (!PyArg_ParseTuple(args,"i;mousemask",&newmask)) 
                return NULL;
        availmask = mousemask(newmask, &oldmask);
@@ -2266,7 +2266,7 @@ PyCurses_Napms(PyObject *self, PyObject *args)
 {
     int ms;
 
-    PyCursesInitialised
+    PyCursesInitialised;
     if (!PyArg_ParseTuple(args, "i;ms", &ms)) return NULL;
 
     return Py_BuildValue("i", napms(ms));
@@ -2279,7 +2279,7 @@ PyCurses_NewPad(PyObject *self, PyObject *args)
   WINDOW *win;
   int nlines, ncols;
 
-  PyCursesInitialised 
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"ii;nlines,ncols",&nlines,&ncols)) return NULL;
 
@@ -2299,7 +2299,7 @@ PyCurses_NewWindow(PyObject *self, PyObject *args)
   WINDOW *win;
   int nlines, ncols, begin_y=0, begin_x=0;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   switch (PyTuple_Size(args)) {
   case 2:
@@ -2330,8 +2330,8 @@ PyCurses_Pair_Content(PyObject *self, PyObject *args)
 {
   short pair,f,b;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   switch(PyTuple_Size(args)) {
   case 1:
@@ -2356,8 +2356,8 @@ PyCurses_pair_number(PyObject *self, PyObject *args)
 {
   int n;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   switch(PyTuple_Size(args)) {
   case 1:
@@ -2386,7 +2386,7 @@ PyCurses_QiFlush(PyObject *self, PyObject *args)
 {
   int flag = 0;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   switch(PyTuple_Size(args)) {
   case 0:
@@ -2462,7 +2462,7 @@ PyCurses_ResizeTerm(PyObject *self, PyObject *args)
   int columns;
   PyObject *result;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines, &columns))
     return NULL;
@@ -2486,7 +2486,7 @@ PyCurses_Resize_Term(PyObject *self, PyObject *args)
 
   PyObject *result;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
     return NULL;
@@ -2505,7 +2505,7 @@ PyCurses_setsyx(PyObject *self, PyObject *args)
 {
   int y,x;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (PyTuple_Size(args)!=2) {
     PyErr_SetString(PyExc_TypeError, "setsyx requires 2 arguments");
@@ -2526,7 +2526,7 @@ PyCurses_Start_Color(PyObject *self)
   int code;
   PyObject *c, *cp;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   code = start_color();
   if (code != ERR) {
@@ -2618,7 +2618,7 @@ PyCurses_TypeAhead(PyObject *self, PyObject *args)
 {
   int fd;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"i;fd",&fd)) return NULL;
 
@@ -2631,7 +2631,7 @@ PyCurses_UnCtrl(PyObject *self, PyObject *args)
   PyObject *temp;
   chtype ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
 
@@ -2649,7 +2649,7 @@ PyCurses_UngetCh(PyObject *self, PyObject *args)
   PyObject *temp;
   chtype ch;
 
-  PyCursesInitialised
+  PyCursesInitialised;
 
   if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
 
@@ -2686,8 +2686,8 @@ PyCurses_Use_Default_Colors(PyObject *self)
 {
   int code;
 
-  PyCursesInitialised
-  PyCursesInitialisedColor
+  PyCursesInitialised;
+  PyCursesInitialisedColor;
 
   code = use_default_colors();
   if (code != ERR) {