From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 1 Nov 2011 17:42:23 +0000 (+0100)
Subject: Replace Py_UNICODE_strchr with PyUnicode_FindChar.
X-Git-Tag: v3.3.0a1~980
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f4f4c596089921e2a1bd53b01cf673cfdad1397;p=thirdparty%2FPython%2Fcpython.git

Replace Py_UNICODE_strchr with PyUnicode_FindChar.
---

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 627c3b1b3810..c02ee384b2cb 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -950,7 +950,6 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
     DialectObj *dialect = self->dialect;
     int i;
     Py_ssize_t rec_len;
-    Py_UNICODE *lineterm;
 
 #define ADDCH(c) \
     do {\
@@ -959,10 +958,6 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
         rec_len++;\
     } while(0)
 
-    lineterm = PyUnicode_AsUnicode(dialect->lineterminator);
-    if (lineterm == NULL)
-        return -1;
-
     rec_len = self->rec_len;
 
     /* If this is not the first field we need a field separator */
@@ -982,7 +977,9 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
         if (c == dialect->delimiter ||
             c == dialect->escapechar ||
             c == dialect->quotechar  ||
-            Py_UNICODE_strchr(lineterm, c)) {
+            PyUnicode_FindChar(
+                dialect->lineterminator, c, 0,
+                PyUnicode_GET_LENGTH(dialect->lineterminator), 1) >= 0) {
             if (dialect->quoting == QUOTE_NONE)
                 want_escape = 1;
             else {