1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 00:28:48 -05:00

src: Remove C99 constructs to ensure C89 compliance

This fixes the error: 'for' loop initial declaration used outside C99
mode by declaring the loop increment variable in the beginning of the
block instead of inside the for loop.

Fixes #5254
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
This commit is contained in:
Tom 2020-04-17 17:53:40 +03:00 committed by Daniel Gustafsson
parent 0f5db7b263
commit 207a6cbb90
2 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____|
*
* Web crawler based on curl and libxml2.
* Copyright (C) 2018 - 2019 Jeroen Ooms <jeroenooms@gmail.com>
* Copyright (C) 2018 - 2020 Jeroen Ooms <jeroenooms@gmail.com>
* License: MIT
*
* To compile:
@ -116,7 +116,8 @@ size_t follow_links(CURLM *multi_handle, memory *mem, char *url)
return 0;
}
size_t count = 0;
for(int i = 0; i < nodeset->nodeNr; i++) {
int i;
for(i = 0; i < nodeset->nodeNr; i++) {
double r = rand();
int x = r * nodeset->nodeNr / RAND_MAX;
const xmlNode *node = nodeset->nodeTab[x]->xmlChildrenNode;

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 2019 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -75,6 +75,7 @@ do {
"this.is.an.otherwise-valid.hostname."
"with-a-label-of-greater-length-than-the-sixty-three-characters-"
"specified.in.the.RFCs.";
int i;
struct test {
const char *name;
@ -96,7 +97,7 @@ do {
{ max, DOH_OK } /* expect buffer overwrite */
};
for(int i = 0; i < (int)(sizeof(playlist)/sizeof(*playlist)); i++) {
for(i = 0; i < (int)(sizeof(playlist)/sizeof(*playlist)); i++) {
const char *name = playlist[i].name;
size_t olen = 100000;
struct demo victim;