summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2009-07-17 08:31:44 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2009-07-17 08:31:44 (GMT)
commitcf7128ccbcf2b68eff6c5b47f6334b01882c818b (patch)
treec8e2e1416c2a479606d7752af3f3c02922692829 /Modules
parenta8336b4fd070d6c6761f48f0af73676027aa6123 (diff)
downloadcpython-cf7128ccbcf2b68eff6c5b47f6334b01882c818b.zip
cpython-cf7128ccbcf2b68eff6c5b47f6334b01882c818b.tar.gz
cpython-cf7128ccbcf2b68eff6c5b47f6334b01882c818b.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_cursesmodule.c3
-rw-r--r--Modules/main.c6
2 files changed, 5 insertions, 4 deletions
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 @@ 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
index 8352e66..22794da 100644
--- 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);
}