[Python-checkins] CVS: python/dist/src/Objects unicodeobject.c,2.132,2.133
Walter D?rwald
doerwalter@users.sourceforge.net
Mon, 25 Mar 2002 03:16:20 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv30807/Objects
Modified Files:
unicodeobject.c
Log Message:
Fix whitespace.
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.132
retrieving revision 2.133
diff -C2 -d -r2.132 -r2.133
*** unicodeobject.c 22 Mar 2002 15:33:15 -0000 2.132
--- unicodeobject.c 25 Mar 2002 11:16:18 -0000 2.133
***************
*** 1644,1651 ****
}
s += i;
! if (chr == 0xffffffff)
! /* _decoding_error will have already written into the
! target buffer. */
! break;
store:
/* when we get here, chr is a 32-bit unicode character */
--- 1644,1651 ----
}
s += i;
! if (chr == 0xffffffff)
! /* _decoding_error will have already written into the
! target buffer. */
! break;
store:
/* when we get here, chr is a 32-bit unicode character */
***************
*** 1655,1659 ****
else if (chr <= 0x10ffff) {
/* UCS-4 character. Either store directly, or as
! surrogate pair. */
#ifdef Py_UNICODE_WIDE
*p++ = chr;
--- 1655,1659 ----
else if (chr <= 0x10ffff) {
/* UCS-4 character. Either store directly, or as
! surrogate pair. */
#ifdef Py_UNICODE_WIDE
*p++ = chr;
***************
*** 1708,1726 ****
default:
! if (s > end) {
! if (unicodeescape_decoding_error(&p, errors, "\\ at end of string"))
! goto onError;
! }
! else {
! *p++ = '\\';
! *p++ = (unsigned char)s[-1];
! }
break;
}
}
if (_PyUnicode_Resize(&v, (int)(p - buf)))
! goto onError;
return (PyObject *)v;
!
ucnhashError:
PyErr_SetString(
--- 1708,1726 ----
default:
! if (s > end) {
! if (unicodeescape_decoding_error(&p, errors, "\\ at end of string"))
! goto onError;
! }
! else {
! *p++ = '\\';
! *p++ = (unsigned char)s[-1];
! }
break;
}
}
if (_PyUnicode_Resize(&v, (int)(p - buf)))
! goto onError;
return (PyObject *)v;
!
ucnhashError:
PyErr_SetString(