diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 09:15:16 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 09:15:16 (GMT) |
| commit | c3c6fed6fe282ca2aedb9b15904bde63218dfc86 (patch) | |
| tree | 2dd7ef87fe904ed056855d9c4e88871c580db807 /Modules | |
| parent | 6b2964d6a484f066b28e79427dd4f1d8dbdb5de5 (diff) | |
| download | cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.zip cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.gz cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.bz2 | |
Merged revisions 74010,74034,74054 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74010 | r.david.murray | 2009-07-15 16:16:54 +0200 (Mi, 15 Jul 2009) | 2 lines
PEP-8-ify r73389.
................
r74034 | alexandre.vassalotti | 2009-07-17 07:35:59 +0200 (Fr, 17 Jul 2009) | 2 lines
The output() function takes only one string argument.
................
r74054 | alexandre.vassalotti | 2009-07-17 10:31:44 +0200 (Fr, 17 Jul 2009) | 14 lines
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.c | 3 | ||||
| -rw-r--r-- | Modules/main.c | 6 |
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); } |