From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79165 invoked by alias); 14 Aug 2019 08:41:34 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 79015 invoked by uid 9078); 14 Aug 2019 08:41:34 -0000 Date: Wed, 14 Aug 2019 08:41:00 -0000 Message-ID: <20190814084134.79014.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] memmem.c and strstr.c: do not require -std=c99 X-Act-Checkin: newlib-cygwin X-Git-Author: Giacomo Tesio X-Git-Refname: refs/heads/master X-Git-Oldrev: 8922b85d6bb5072441468ea24e764a825b9e1d9f X-Git-Newrev: 6aaaa2e768358f2362b67d9bbd4b7b5ce5513a35 X-SW-Source: 2019-q3/txt/msg00025.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6aaaa2e768358f2362b67d9bbd4b7b5ce5513a35 commit 6aaaa2e768358f2362b67d9bbd4b7b5ce5513a35 Author: Giacomo Tesio Date: Tue Aug 13 02:00:07 2019 +0200 memmem.c and strstr.c: do not require -std=c99 Diff: --- newlib/libc/string/memmem.c | 3 ++- newlib/libc/string/strstr.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c index 55d2459..65267b9 100644 --- a/newlib/libc/string/memmem.c +++ b/newlib/libc/string/memmem.c @@ -143,10 +143,11 @@ memmem (const void *haystack, size_t hs_len, const void *needle, size_t ne_len) size_t tmp, shift1; size_t m1 = ne_len - 1; size_t offset = 0; + int i; /* Initialize bad character shift hash table. */ memset (shift, 0, sizeof (shift)); - for (int i = 1; i < m1; i++) + for (i = 1; i < m1; i++) shift[hash2 (ne + i)] = i; shift1 = m1 - shift[hash2 (ne + m1)]; shift[hash2 (ne + m1)] = m1; diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c index 0256c1a..00fe060 100644 --- a/newlib/libc/string/strstr.c +++ b/newlib/libc/string/strstr.c @@ -102,7 +102,8 @@ strstr2 (const unsigned char *hs, const unsigned char *ne) { uint32_t h1 = (ne[0] << 16) | ne[1]; uint32_t h2 = 0; - for (int c = hs[0]; h1 != h2 && c != 0; c = *++hs) + int c; + for (c = hs[0]; h1 != h2 && c != 0; c = *++hs) h2 = (h2 << 16) | c; return h1 == h2 ? (char *)hs - 2 : NULL; } @@ -112,7 +113,8 @@ strstr3 (const unsigned char *hs, const unsigned char *ne) { uint32_t h1 = (ne[0] << 24) | (ne[1] << 16) | (ne[2] << 8); uint32_t h2 = 0; - for (int c = hs[0]; h1 != h2 && c != 0; c = *++hs) + int c; + for (c = hs[0]; h1 != h2 && c != 0; c = *++hs) h2 = (h2 | c) << 8; return h1 == h2 ? (char *)hs - 3 : NULL; } @@ -122,7 +124,8 @@ strstr4 (const unsigned char *hs, const unsigned char *ne) { uint32_t h1 = (ne[0] << 24) | (ne[1] << 16) | (ne[2] << 8) | ne[3]; uint32_t h2 = 0; - for (int c = hs[0]; c != 0 && h1 != h2; c = *++hs) + int c; + for (c = hs[0]; c != 0 && h1 != h2; c = *++hs) h2 = (h2 << 8) | c; return h1 == h2 ? (char *)hs - 4 : NULL; } @@ -142,6 +145,7 @@ strstr (const char *haystack, const char *needle) { const unsigned char *hs = (const unsigned char *) haystack; const unsigned char *ne = (const unsigned char *) needle; + int i; /* Handle short needle special cases first. */ if (ne[0] == '\0') @@ -170,7 +174,7 @@ strstr (const char *haystack, const char *needle) /* Initialize bad character shift hash table. */ memset (shift, ne_len + 1, sizeof (shift)); - for (int i = 0; i < ne_len; i++) + for (i = 0; i < ne_len; i++) shift[ne[i] % sizeof (shift)] = ne_len - i; do