diff options
author | Christian Heimes <christian@cheimes.de> | 2008-10-02 19:56:01 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-10-02 19:56:01 (GMT) |
commit | 1a8501c64837368a6973ff3f9850b652888c281a (patch) | |
tree | 0884a11d8b60a9d6db6262ab91b5e70e00934368 /Objects | |
parent | c472532c0cd056a23f4d50bd9a03d0fdea856a0a (diff) | |
download | cpython-1a8501c64837368a6973ff3f9850b652888c281a.zip cpython-1a8501c64837368a6973ff3f9850b652888c281a.tar.gz cpython-1a8501c64837368a6973ff3f9850b652888c281a.tar.bz2 |
Merged revisions 66748 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66748 | christian.heimes | 2008-10-02 21:47:50 +0200 (Thu, 02 Oct 2008) | 1 line
Fixed a couple more C99 comments and one occurence of inline.
........
+ another // comment in bytesobject
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/bytesobject.c | 2 | ||||
-rw-r--r-- | Objects/unicodeobject.c | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index e924e8d..0d0efc9 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2965,7 +2965,7 @@ PyBytes_FromObject(PyObject *x) new = PyBytes_FromStringAndSize(NULL, view.len); if (!new) goto fail; - // XXX(brett.cannon): Better way to get to internal buffer? + /* XXX(brett.cannon): Better way to get to internal buffer? */ if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval, &view, view.len, 'C') < 0) goto fail; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 60cd957..0c5c6ef 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -126,19 +126,19 @@ static const char unicode_default_encoding[] = "utf-8"; /* Fast detection of the most frequent whitespace characters */ const unsigned char _Py_ascii_whitespace[] = { 0, 0, 0, 0, 0, 0, 0, 0, -// case 0x0009: /* HORIZONTAL TABULATION */ -// case 0x000A: /* LINE FEED */ -// case 0x000B: /* VERTICAL TABULATION */ -// case 0x000C: /* FORM FEED */ -// case 0x000D: /* CARRIAGE RETURN */ +/* case 0x0009: * HORIZONTAL TABULATION */ +/* case 0x000A: * LINE FEED */ +/* case 0x000B: * VERTICAL TABULATION */ +/* case 0x000C: * FORM FEED */ +/* case 0x000D: * CARRIAGE RETURN */ 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -// case 0x001C: /* FILE SEPARATOR */ -// case 0x001D: /* GROUP SEPARATOR */ -// case 0x001E: /* RECORD SEPARATOR */ -// case 0x001F: /* UNIT SEPARATOR */ +/* case 0x001C: * FILE SEPARATOR */ +/* case 0x001D: * GROUP SEPARATOR */ +/* case 0x001E: * RECORD SEPARATOR */ +/* case 0x001F: * UNIT SEPARATOR */ 0, 0, 0, 0, 1, 1, 1, 1, -// case 0x0020: /* SPACE */ +/* case 0x0020: * SPACE */ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -157,13 +157,13 @@ const unsigned char _Py_ascii_whitespace[] = { /* Same for linebreaks */ static unsigned char ascii_linebreak[] = { 0, 0, 0, 0, 0, 0, 0, 0, -// 0x000A, /* LINE FEED */ -// 0x000D, /* CARRIAGE RETURN */ +/* 0x000A, * LINE FEED */ +/* 0x000D, * CARRIAGE RETURN */ 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -// 0x001C, /* FILE SEPARATOR */ -// 0x001D, /* GROUP SEPARATOR */ -// 0x001E, /* RECORD SEPARATOR */ +/* 0x001C, * FILE SEPARATOR */ +/* 0x001D, * GROUP SEPARATOR */ +/* 0x001E, * RECORD SEPARATOR */ 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |