summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2019-06-13 14:27:58 +0200
committerMaria Matejka <mq@ucw.cz>2019-06-13 14:27:58 +0200
commit5c864e2cfaf5ff5e8e3db3ccd746162fbc7aac5b (patch)
tree01fbbd6cd1a7122fcdca1a38c48d6e854763ad9d /conf
parent87c82334a77dfa3fea3057fa6d4bcf8558f203a4 (diff)
String: bstrtoul macro expanded to bstrtoul10 and 16
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l14
1 files changed, 7 insertions, 7 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 83e4e77c..09f3db8d 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -168,7 +168,7 @@ WHITE [ \t]
char *e;
errno = 0;
- l = bstrtoul(yytext, &e, 10);
+ l = bstrtoul10(yytext, &e);
if (e && (*e != ':') || (errno == ERANGE) || (l >> 32))
cf_error("ASN out of range");
@@ -186,7 +186,7 @@ WHITE [ \t]
}
errno = 0;
- l = bstrtoul(e+1, &e, 10);
+ l = bstrtoul10(e+1, &e);
if (e && *e || (errno == ERANGE) || (l >> len2))
cf_error("Number out of range");
cf_lval.i64 |= l;
@@ -213,13 +213,13 @@ WHITE [ \t]
}
errno = 0;
- l = bstrtoul(yytext+2, &e, 10);
+ l = bstrtoul10(yytext+2, &e);
if (e && (*e != ':') || (errno == ERANGE) || (l >> len1))
cf_error("ASN out of range");
cf_lval.i64 |= ((u64) l) << len2;
errno = 0;
- l = bstrtoul(e+1, &e, 10);
+ l = bstrtoul10(e+1, &e);
if (e && *e || (errno == ERANGE) || (l >> len2))
cf_error("Number out of range");
cf_lval.i64 |= l;
@@ -241,7 +241,7 @@ WHITE [ \t]
cf_lval.i64 |= ((u64) ip4_to_u32(ip4)) << 16;
errno = 0;
- l = bstrtoul(e, &e, 10);
+ l = bstrtoul10(e, &e);
if (e && *e || (errno == ERANGE) || (l >> 16))
cf_error("Number out of range");
cf_lval.i64 |= l;
@@ -265,7 +265,7 @@ WHITE [ \t]
char *e;
unsigned long int l;
errno = 0;
- l = bstrtoul(yytext+2, &e, 16);
+ l = bstrtoul16(yytext+2, &e);
if (e && *e || errno == ERANGE || (unsigned long int)(unsigned int) l != l)
cf_error("Number out of range");
cf_lval.i = l;
@@ -276,7 +276,7 @@ WHITE [ \t]
char *e;
unsigned long int l;
errno = 0;
- l = bstrtoul(yytext, &e, 10);
+ l = bstrtoul10(yytext, &e);
if (e && *e || errno == ERANGE || (unsigned long int)(unsigned int) l != l)
cf_error("Number out of range");
cf_lval.i = l;