annotate Python/getversion.c @ 17996:5a9debb14440 legacy-trunk

Internal refactoring of convertsimple() and friends. Note that lots of code was re-indented. Replace two-step of convertsimple() and convertsimple1() with convertsimple() and helper converterr(), which is called to format error messages when convertsimple() fails. The old code did all the real work in convertsimple1(), but deferred error message formatting to conversimple(). The result was paying the price of a second function call on every call just to format error messages in the failure cases. Factor out of the buffer-handling code in convertsimple() and package it as convertbuffer(). Add two macros to ease readability of Unicode coversions, UNICODE_DEFAULT_ENCODING() and CONV_UNICODE, an error string. The convertsimple() routine had awful indentation problems, primarily because there were two tabs between the case line and the body of the case statements. This patch reformats the entire function to have a single tab between case line and case body, which makes the code easier to read (and consistent with ceval). The introduction of converterr() exacerbated the problem and prompted this fix. Also, eliminate non-standard whitespace after opening paren and before closing paren in a few if statements. (This checkin is part of SF patch 426072.)
author Jeremy Hylton <jeremy@alum.mit.edu>
date Tue, 29 May 2001 17:37:05 +0000
parents 6f6f965c5e2d
children 379fc66f4c96
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3212
diff changeset
1
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
2 /* Return the full version string. */
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3
3101
237c3b2a6187 include Python.h
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
4 #include "Python.h"
237c3b2a6187 include Python.h
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
5
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
6 #include "patchlevel.h"
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
7
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
8 const char *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13256
diff changeset
9 Py_GetVersion(void)
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
10 {
10668
8c6ffe670963 Allow longer strings (up to 80 chars each) for version, build,
Guido van Rossum <guido@python.org>
parents: 9970
diff changeset
11 static char version[250];
8c6ffe670963 Allow longer strings (up to 80 chars each) for version, build,
Guido van Rossum <guido@python.org>
parents: 9970
diff changeset
12 sprintf(version, "%.80s (%.80s) %.80s", PY_VERSION,
9745
6fc58d79dac5 Use PY_VERSION instead of PATCHLEVEL.
Guido van Rossum <guido@python.org>
parents: 5860
diff changeset
13 Py_GetBuildInfo(), Py_GetCompiler());
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
14 return version;
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
15 }