Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/option.c: fix build with gcc 4.8

Browse Source 
Fix the following build failure with gcc 4.8 raised since version 2.86:

option.c: In function 'one_opt':
option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode
           for (char *p = arg; *p; p++) {
           ^
option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code
option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode
           for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
           ^

Fixes:
 - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
This commit is contained in:
Fabrice Fontaine
2021-12-31 17:29:44 +01:00
committed by Simon Kelley
parent 41adecad14
commit 46312909d9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/option.c
View File

@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
arg += 9; arg += 9;
if (strlen(arg) != 16) if (strlen(arg) != 16)
ret_err(gen_err); ret_err(gen_err);
for (char *p = arg; *p; p++) { char *p;
for (*p = arg; *p; p++) {
if (!isxdigit((int)*p)) if (!isxdigit((int)*p))
ret_err(gen_err); ret_err(gen_err);
} }
@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
u8 *u = daemon->umbrella_device; u8 *u = daemon->umbrella_device;
char word[3]; char word[3];
for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { u8 i;
for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
memcpy(word, &(arg[0]), 2); memcpy(word, &(arg[0]), 2);
*u++ = strtoul(word, NULL, 16); *u++ = strtoul(word, NULL, 16);
} }