Remove the two ugly and unused WRITE_ASCII_OR_WSTR and WRITE_WSTR macros

This commit is contained in:
Victor Stinner 2011-11-20 18:41:31 +01:00
parent 2e9cfadd7c
commit d5c4022d2a

View file

@ -5589,21 +5589,6 @@ length_of_escaped_ascii_string(const char *s, Py_ssize_t size)
return length; return length;
} }
/* Similar to PyUnicode_WRITE but either write into wstr field
or treat string as ASCII. */
#define WRITE_ASCII_OR_WSTR(kind, buf, index, value) \
do { \
if ((kind) != PyUnicode_WCHAR_KIND) \
((unsigned char *)(buf))[(index)] = (unsigned char)(value); \
else \
((Py_UNICODE *)(buf))[(index)] = (Py_UNICODE)(value); \
} while (0)
#define WRITE_WSTR(buf, index, value) \
assert(kind == PyUnicode_WCHAR_KIND), \
((Py_UNICODE *)(buf))[(index)] = (Py_UNICODE)(value)
static _PyUnicode_Name_CAPI *ucnhash_CAPI = NULL; static _PyUnicode_Name_CAPI *ucnhash_CAPI = NULL;
PyObject * PyObject *
@ -5873,9 +5858,6 @@ PyUnicode_DecodeUnicodeEscape(const char *s,
return NULL; return NULL;
} }
#undef WRITE_ASCII_OR_WSTR
#undef WRITE_WSTR
/* Return a Unicode-Escape string version of the Unicode object. /* Return a Unicode-Escape string version of the Unicode object.
If quotes is true, the string is enclosed in u"" or u'' quotes as If quotes is true, the string is enclosed in u"" or u'' quotes as