Merged revisions 74051-74052 via svnmerge from

avassalotti · avassalotti · commit cf7128ccbcf2 · 2009-07-17T08:31:44.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74051 | alexandre.vassalotti | 2009-07-17 03:54:23 -0400 (Fri, 17 Jul 2009) | 2 lines

  Initialize variables in PyCurses_getsyx() to avoid compiler warnings.
........
  r74052 | alexandre.vassalotti | 2009-07-17 04:09:04 -0400 (Fri, 17 Jul 2009) | 3 lines

  Fix GCC warning about fprintf used without a string literal and
  without format arguments.
........
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -1806,7 +1806,8 @@ PyCurses_EraseChar(PyObject *self)
 static PyObject *
 PyCurses_getsyx(PyObject *self)
 {
-  int x,y;
+  int x = 0;
+  int y = 0;
 
   PyCursesInitialised
 
diff --git a/Modules/main.c b/Modules/main.c
@@ -131,9 +131,9 @@ usage(int exitcode, wchar_t* program)
 	if (exitcode)
 		fprintf(f, "Try `python -h' for more information.\n");
 	else {
-		fprintf(f, usage_1);
-		fprintf(f, usage_2);
-		fprintf(f, usage_3);
+		fputs(usage_1, f);
+		fputs(usage_2, f);
+		fputs(usage_3, f);
 		fprintf(f, usage_4, DELIM);
 		fprintf(f, usage_5, DELIM, PYTHONHOMEHELP);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1806,7 +1806,8 @@ PyCurses_EraseChar(PyObject *self)`
`1806`	`1806`	`static PyObject *`
`1807`	`1807`	`PyCurses_getsyx(PyObject *self)`
`1808`	`1808`	`{`
`1809`		`- int x,y;`
	`1809`	`+ int x = 0;`
	`1810`	`+ int y = 0;`
`1810`	`1811`
`1811`	`1812`	`PyCursesInitialised`
`1812`	`1813`