Merged revisions 74051-74052 via svnmerge from
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
index a92cc8e..c7d3778 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1806,7 +1806,8 @@
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
index 8352e66..22794da 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -131,9 +131,9 @@
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);
}