mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #5592: make the encodefuncs symbol static

Browse source
This commit is contained in:
Antoine Pitrou 2009-03-28 22:16:42 +00:00
parent e549ead826
commit 24f3629083
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/_textio.c
View file

@ -1,8 +1,8 @@
/* /*
An implementation of Text I/O as defined by PEP 3116 - "New I/O" An implementation of Text I/O as defined by PEP 3116 - "New I/O"
Classes defined here: TextIOBase, IncrementalNewlineDecoder, TextIOWrapper. Classes defined here: TextIOBase, IncrementalNewlineDecoder, TextIOWrapper.
Written by Amaury Forgeot d'Arc and Antoine Pitrou Written by Amaury Forgeot d'Arc and Antoine Pitrou
*/ */
@ -169,7 +169,7 @@ typedef struct {
} PyNewLineDecoderObject; } PyNewLineDecoderObject;
static int static int
IncrementalNewlineDecoder_init(PyNewLineDecoderObject *self, IncrementalNewlineDecoder_init(PyNewLineDecoderObject *self,
PyObject *args, PyObject *kwds) PyObject *args, PyObject *kwds)
{ {
PyObject *decoder; PyObject *decoder;
@ -215,7 +215,7 @@ IncrementalNewlineDecoder_dealloc(PyNewLineDecoderObject *self)
#define SEEN_ALL (SEEN_CR | SEEN_LF | SEEN_CRLF) #define SEEN_ALL (SEEN_CR | SEEN_LF | SEEN_CRLF)
PyObject * PyObject *
_PyIncrementalNewlineDecoder_decode(PyObject *_self, _PyIncrementalNewlineDecoder_decode(PyObject *_self,
PyObject *input, int final) PyObject *input, int final)
{ {
PyObject *output; PyObject *output;
@ -267,7 +267,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *_self,
* then readline() is sure to get \r\n in one pass * then readline() is sure to get \r\n in one pass
*/ */
if (!final) { if (!final) {
if (output_len > 0 if (output_len > 0
&& PyUnicode_AS_UNICODE(output)[output_len - 1] == '\r') { && PyUnicode_AS_UNICODE(output)[output_len - 1] == '\r') {
if (Py_REFCNT(output) == 1) { if (Py_REFCNT(output) == 1) {
@ -433,7 +433,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *_self,
} }
static PyObject * static PyObject *
IncrementalNewlineDecoder_decode(PyNewLineDecoderObject *self, IncrementalNewlineDecoder_decode(PyNewLineDecoderObject *self,
PyObject *args, PyObject *kwds) PyObject *args, PyObject *kwds)
{ {
char *kwlist[] = {"input", "final", NULL}; char *kwlist[] = {"input", "final", NULL};
@ -635,7 +635,7 @@ typedef struct
/* Reads and writes are internally buffered in order to speed things up. /* Reads and writes are internally buffered in order to speed things up.
However, any read will first flush the write buffer if itsn't empty. However, any read will first flush the write buffer if itsn't empty.
Please also note that text to be written is first encoded before being Please also note that text to be written is first encoded before being
buffered. This is necessary so that encoding errors are immediately buffered. This is necessary so that encoding errors are immediately
reported to the caller, but it unfortunately means that the reported to the caller, but it unfortunately means that the
@ -731,7 +731,7 @@ typedef struct {
encodefunc_t encodefunc; encodefunc_t encodefunc;
} encodefuncentry; } encodefuncentry;
encodefuncentry encodefuncs[] = { static encodefuncentry encodefuncs[] = {
{"ascii", (encodefunc_t) ascii_encode}, {"ascii", (encodefunc_t) ascii_encode},
{"iso8859-1", (encodefunc_t) latin1_encode}, {"iso8859-1", (encodefunc_t) latin1_encode},
{"utf-16-be", (encodefunc_t) utf16be_encode}, {"utf-16-be", (encodefunc_t) utf16be_encode},
@ -942,7 +942,7 @@ TextIOWrapper_init(PyTextIOWrapperObject *self, PyObject *args, PyObject *kwds)
self->buffer = buffer; self->buffer = buffer;
Py_INCREF(buffer); Py_INCREF(buffer);
if (Py_TYPE(buffer) == &PyBufferedReader_Type || if (Py_TYPE(buffer) == &PyBufferedReader_Type ||
Py_TYPE(buffer) == &PyBufferedWriter_Type || Py_TYPE(buffer) == &PyBufferedWriter_Type ||
Py_TYPE(buffer) == &PyBufferedRandom_Type) { Py_TYPE(buffer) == &PyBufferedRandom_Type) {
@ -1084,7 +1084,7 @@ findchar(const Py_UNICODE *s, Py_ssize_t size, Py_UNICODE ch)
return NULL; return NULL;
} }
/* Flush the internal write buffer. This doesn't explicitly flush the /* Flush the internal write buffer. This doesn't explicitly flush the
underlying buffered object, though. */ underlying buffered object, though. */
static int static int
_TextIOWrapper_writeflush(PyTextIOWrapperObject *self) _TextIOWrapper_writeflush(PyTextIOWrapperObject *self)
@ -1177,7 +1177,7 @@ TextIOWrapper_write(PyTextIOWrapperObject *self, PyObject *args)
if (_TextIOWrapper_writeflush(self) < 0) if (_TextIOWrapper_writeflush(self) < 0)
return NULL; return NULL;
} }
if (needflush) { if (needflush) {
ret = PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_flush, NULL); ret = PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_flush, NULL);
if (ret == NULL) if (ret == NULL)