[Python-checkins] CVS: python/dist/src/Objects unicodeobject.c,2.48,2.49
Greg Stein
python-dev@python.org
2000年7月16日 14:39:52 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18430
Modified Files:
unicodeobject.c
Log Message:
stop messing around with goto and just write the macro correctly.
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** unicodeobject.c 2000年07月16日 18:47:43 2.48
--- unicodeobject.c 2000年07月16日 21:39:49 2.49
***************
*** 632,640 ****
}
! #define UTF8_ERROR(details) do { \
! if (utf8_decoding_error(&s, &p, errors, details)) \
! goto onError; \
! goto nextChar; \
! } while (0)
PyObject *PyUnicode_DecodeUTF8(const char *s,
--- 632,641 ----
}
! #define UTF8_ERROR(details) \
! if (1) { \
! if (utf8_decoding_error(&s, &p, errors, (details))) \
! goto onError; \
! continue; \
! } else
PyObject *PyUnicode_DecodeUTF8(const char *s,
***************
*** 732,737 ****
}
s += n;
- nextChar:
- /* empty */;
}
--- 733,736 ----