Author: guido.van.rossum
Date: Thu May 10 01:38:34 2007
New Revision: 55214
Modified:
python/branches/py3k-struni/Parser/tokenizer.c
Log:
Use AsCharBuffer to get a C string out of a Python string.
Modified: python/branches/py3k-struni/Parser/tokenizer.c
==============================================================================
--- python/branches/py3k-struni/Parser/tokenizer.c (original)
+++ python/branches/py3k-struni/Parser/tokenizer.c Thu May 10 01:38:34 2007
@@ -355,44 +355,31 @@
static char *
fp_readl(char *s, int size, struct tok_state *tok)
{
- PyObject* utf8 = NULL;
- PyObject* buf = tok->decoding_buffer;
- char *str;
- Py_ssize_t utf8len;
+ PyObject* bufobj = tok->decoding_buffer;
+ const char *buf;
+ Py_ssize_t buflen;
/* Ask for one less byte so we can terminate it */
assert(size > 0);
size--;
- if (buf == NULL) {
- buf = PyObject_CallObject(tok->decoding_readline, NULL);
- if (buf == NULL)
- return error_ret(tok);
- } else {
- tok->decoding_buffer = NULL;
- if (PyString_CheckExact(buf))
- utf8 = buf;
- }
- if (utf8 == NULL) {
- utf8 = PyUnicode_AsUTF8String(buf);
- Py_DECREF(buf);
- if (utf8 == NULL)
+ if (bufobj == NULL) {
+ bufobj = PyObject_CallObject(tok->decoding_readline, NULL);
+ if (bufobj == NULL)
return error_ret(tok);
}
- str = PyString_AsString(utf8);
- utf8len = PyString_GET_SIZE(utf8);
- if (utf8len > size) {
- tok->decoding_buffer = PyString_FromStringAndSize(str+size,
utf8len-size);
- if (tok->decoding_buffer == NULL) {
- Py_DECREF(utf8);
+ if (PyObject_AsCharBuffer(bufobj, &buf, &buflen) < 0)
+ return error_ret(tok);
+ if (buflen > size) {
+ tok->decoding_buffer = PyBytes_FromStringAndSize(buf+size,
+ buflen-size);
+ if (tok->decoding_buffer == NULL)
return error_ret(tok);
- }
- utf8len = size;
+ buflen = size;
}
- memcpy(s, str, utf8len);
- s[utf8len] = '\0';
- Py_DECREF(utf8);
- if (utf8len == 0) return NULL; /* EOF */
+ memcpy(s, buf, buflen);
+ s[buflen] = '\0';
+ if (buflen == 0) return NULL; /* EOF */
return s;
}
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
