Skip to content

Commit 2b14676

Browse files
committed
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 ........
1 parent d6d058f commit 2b14676

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎Modules/_cursesmodule.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,8 +1748,8 @@ PyCurses_Color_Content(PyObject *self, PyObject *args)
17481748
{
17491749
short color,r,g,b;
17501750

1751-
PyCursesInitialised
1752-
PyCursesInitialisedColor
1751+
PyCursesInitialised;
1752+
PyCursesInitialisedColor;
17531753

17541754
if (!PyArg_ParseTuple(args, "h:color_content", &color)) return NULL;
17551755

@@ -1767,8 +1767,8 @@ PyCurses_color_pair(PyObject *self, PyObject *args)
17671767
{
17681768
int n;
17691769

1770-
PyCursesInitialised
1771-
PyCursesInitialisedColor
1770+
PyCursesInitialised;
1771+
PyCursesInitialisedColor;
17721772

17731773
if (!PyArg_ParseTuple(args, "i:color_pair", &n)) return NULL;
17741774
return PyLong_FromLong((long) (n << 8));
@@ -1779,7 +1779,7 @@ PyCurses_Curs_Set(PyObject *self, PyObject *args)
17791779
{
17801780
int vis,erg;
17811781

1782-
PyCursesInitialised
1782+
PyCursesInitialised;
17831783

17841784
if (!PyArg_ParseTuple(args, "i:curs_set", &vis)) return NULL;
17851785

@@ -1794,7 +1794,7 @@ PyCurses_Delay_Output(PyObject *self, PyObject *args)
17941794
{
17951795
int ms;
17961796

1797-
PyCursesInitialised
1797+
PyCursesInitialised;
17981798

17991799
if (!PyArg_ParseTuple(args, "i:delay_output", &ms)) return NULL;
18001800

@@ -1806,7 +1806,7 @@ PyCurses_EraseChar(PyObject *self)
18061806
{
18071807
char ch;
18081808

1809-
PyCursesInitialised
1809+
PyCursesInitialised;
18101810

18111811
ch = erasechar();
18121812

@@ -1819,7 +1819,7 @@ PyCurses_getsyx(PyObject *self)
18191819
int x = 0;
18201820
int y = 0;
18211821

1822-
PyCursesInitialised
1822+
PyCursesInitialised;
18231823

18241824
getsyx(y, x);
18251825

@@ -1833,7 +1833,7 @@ PyCurses_GetMouse(PyObject *self)
18331833
int rtn;
18341834
MEVENT event;
18351835

1836-
PyCursesInitialised
1836+
PyCursesInitialised;
18371837

18381838
rtn = getmouse( &event );
18391839
if (rtn == ERR) {
@@ -1851,7 +1851,7 @@ PyCurses_UngetMouse(PyObject *self, PyObject *args)
18511851
{
18521852
MEVENT event;
18531853

1854-
PyCursesInitialised
1854+
PyCursesInitialised;
18551855
if (!PyArg_ParseTuple(args, "hiiil",
18561856
&event.id,
18571857
&event.x, &event.y, &event.z,
@@ -1872,7 +1872,7 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream)
18721872
size_t datalen;
18731873
WINDOW *win;
18741874

1875-
PyCursesInitialised
1875+
PyCursesInitialised;
18761876

18771877
strcpy(fn, "/tmp/py.curses.getwin.XXXXXX");
18781878
fd = mkstemp(fn);
@@ -1923,7 +1923,7 @@ PyCurses_HalfDelay(PyObject *self, PyObject *args)
19231923
{
19241924
unsigned char tenths;
19251925

1926-
PyCursesInitialised
1926+
PyCursesInitialised;
19271927

19281928
if (!PyArg_ParseTuple(args, "b:halfdelay", &tenths)) return NULL;
19291929

@@ -1936,7 +1936,7 @@ static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
19361936
{
19371937
int ch;
19381938

1939-
PyCursesInitialised
1939+
PyCursesInitialised;
19401940

19411941
if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
19421942

@@ -1954,8 +1954,8 @@ PyCurses_Init_Color(PyObject *self, PyObject *args)
19541954
{
19551955
short color, r, g, b;
19561956

1957-
PyCursesInitialised
1958-
PyCursesInitialisedColor
1957+
PyCursesInitialised;
1958+
PyCursesInitialisedColor;
19591959

19601960
switch(PyTuple_Size(args)) {
19611961
case 4:
@@ -1974,8 +1974,8 @@ PyCurses_Init_Pair(PyObject *self, PyObject *args)
19741974
{
19751975
short pair, f, b;
19761976

1977-
PyCursesInitialised
1978-
PyCursesInitialisedColor
1977+
PyCursesInitialised;
1978+
PyCursesInitialisedColor;
19791979

19801980
if (PyTuple_Size(args) != 3) {
19811981
PyErr_SetString(PyExc_TypeError, "init_pair requires 3 arguments");
@@ -2148,7 +2148,7 @@ PyCurses_IntrFlush(PyObject *self, PyObject *args)
21482148
{
21492149
int ch;
21502150

2151-
PyCursesInitialised
2151+
PyCursesInitialised;
21522152

21532153
switch(PyTuple_Size(args)) {
21542154
case 1:
@@ -2170,7 +2170,7 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *args)
21702170
int columns;
21712171
int result;
21722172

2173-
PyCursesInitialised
2173+
PyCursesInitialised;
21742174

21752175
if (!PyArg_ParseTuple(args,"ii:is_term_resized", &lines, &columns))
21762176
return NULL;
@@ -2192,7 +2192,7 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
21922192
const char *knp;
21932193
int ch;
21942194

2195-
PyCursesInitialised
2195+
PyCursesInitialised;
21962196

21972197
if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
21982198

@@ -2221,7 +2221,7 @@ PyCurses_Meta(PyObject *self, PyObject *args)
22212221
{
22222222
int ch;
22232223

2224-
PyCursesInitialised
2224+
PyCursesInitialised;
22252225

22262226
switch(PyTuple_Size(args)) {
22272227
case 1:
@@ -2240,7 +2240,7 @@ static PyObject *
22402240
PyCurses_MouseInterval(PyObject *self, PyObject *args)
22412241
{
22422242
int interval;
2243-
PyCursesInitialised
2243+
PyCursesInitialised;
22442244

22452245
if (!PyArg_ParseTuple(args,"i;interval",&interval))
22462246
return NULL;
@@ -2253,7 +2253,7 @@ PyCurses_MouseMask(PyObject *self, PyObject *args)
22532253
int newmask;
22542254
mmask_t oldmask, availmask;
22552255

2256-
PyCursesInitialised
2256+
PyCursesInitialised;
22572257
if (!PyArg_ParseTuple(args,"i;mousemask",&newmask))
22582258
return NULL;
22592259
availmask = mousemask(newmask, &oldmask);
@@ -2266,7 +2266,7 @@ PyCurses_Napms(PyObject *self, PyObject *args)
22662266
{
22672267
int ms;
22682268

2269-
PyCursesInitialised
2269+
PyCursesInitialised;
22702270
if (!PyArg_ParseTuple(args, "i;ms", &ms)) return NULL;
22712271

22722272
return Py_BuildValue("i", napms(ms));
@@ -2279,7 +2279,7 @@ PyCurses_NewPad(PyObject *self, PyObject *args)
22792279
WINDOW *win;
22802280
int nlines, ncols;
22812281

2282-
PyCursesInitialised
2282+
PyCursesInitialised;
22832283

22842284
if (!PyArg_ParseTuple(args,"ii;nlines,ncols",&nlines,&ncols)) return NULL;
22852285

@@ -2299,7 +2299,7 @@ PyCurses_NewWindow(PyObject *self, PyObject *args)
22992299
WINDOW *win;
23002300
int nlines, ncols, begin_y=0, begin_x=0;
23012301

2302-
PyCursesInitialised
2302+
PyCursesInitialised;
23032303

23042304
switch (PyTuple_Size(args)) {
23052305
case 2:
@@ -2330,8 +2330,8 @@ PyCurses_Pair_Content(PyObject *self, PyObject *args)
23302330
{
23312331
short pair,f,b;
23322332

2333-
PyCursesInitialised
2334-
PyCursesInitialisedColor
2333+
PyCursesInitialised;
2334+
PyCursesInitialisedColor;
23352335

23362336
switch(PyTuple_Size(args)) {
23372337
case 1:
@@ -2356,8 +2356,8 @@ PyCurses_pair_number(PyObject *self, PyObject *args)
23562356
{
23572357
int n;
23582358

2359-
PyCursesInitialised
2360-
PyCursesInitialisedColor
2359+
PyCursesInitialised;
2360+
PyCursesInitialisedColor;
23612361

23622362
switch(PyTuple_Size(args)) {
23632363
case 1:
@@ -2386,7 +2386,7 @@ PyCurses_QiFlush(PyObject *self, PyObject *args)
23862386
{
23872387
int flag = 0;
23882388

2389-
PyCursesInitialised
2389+
PyCursesInitialised;
23902390

23912391
switch(PyTuple_Size(args)) {
23922392
case 0:
@@ -2462,7 +2462,7 @@ PyCurses_ResizeTerm(PyObject *self, PyObject *args)
24622462
int columns;
24632463
PyObject *result;
24642464

2465-
PyCursesInitialised
2465+
PyCursesInitialised;
24662466

24672467
if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines, &columns))
24682468
return NULL;
@@ -2486,7 +2486,7 @@ PyCurses_Resize_Term(PyObject *self, PyObject *args)
24862486

24872487
PyObject *result;
24882488

2489-
PyCursesInitialised
2489+
PyCursesInitialised;
24902490

24912491
if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
24922492
return NULL;
@@ -2505,7 +2505,7 @@ PyCurses_setsyx(PyObject *self, PyObject *args)
25052505
{
25062506
int y,x;
25072507

2508-
PyCursesInitialised
2508+
PyCursesInitialised;
25092509

25102510
if (PyTuple_Size(args)!=2) {
25112511
PyErr_SetString(PyExc_TypeError, "setsyx requires 2 arguments");
@@ -2526,7 +2526,7 @@ PyCurses_Start_Color(PyObject *self)
25262526
int code;
25272527
PyObject *c, *cp;
25282528

2529-
PyCursesInitialised
2529+
PyCursesInitialised;
25302530

25312531
code = start_color();
25322532
if (code != ERR) {
@@ -2618,7 +2618,7 @@ PyCurses_TypeAhead(PyObject *self, PyObject *args)
26182618
{
26192619
int fd;
26202620

2621-
PyCursesInitialised
2621+
PyCursesInitialised;
26222622

26232623
if (!PyArg_ParseTuple(args,"i;fd",&fd)) return NULL;
26242624

@@ -2631,7 +2631,7 @@ PyCurses_UnCtrl(PyObject *self, PyObject *args)
26312631
PyObject *temp;
26322632
chtype ch;
26332633

2634-
PyCursesInitialised
2634+
PyCursesInitialised;
26352635

26362636
if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
26372637

@@ -2649,7 +2649,7 @@ PyCurses_UngetCh(PyObject *self, PyObject *args)
26492649
PyObject *temp;
26502650
chtype ch;
26512651

2652-
PyCursesInitialised
2652+
PyCursesInitialised;
26532653

26542654
if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
26552655

@@ -2686,8 +2686,8 @@ PyCurses_Use_Default_Colors(PyObject *self)
26862686
{
26872687
int code;
26882688

2689-
PyCursesInitialised
2690-
PyCursesInitialisedColor
2689+
PyCursesInitialised;
2690+
PyCursesInitialisedColor;
26912691

26922692
code = use_default_colors();
26932693
if (code != ERR) {

0 commit comments

Comments
 (0)