| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102 |
- From 463ae6f09e485faf3d1cdc4daceefe4bcd50b50e Mon Sep 17 00:00:00 2001
- From: Willy Tarreau <w@1wt.eu>
- Date: Tue, 8 Jul 2014 00:59:48 +0200
- Subject: [PATCH 13/21] BUILD: http: fix isdigit & isspace warnings on Solaris
-
- As usual, when touching any is* function, Solaris complains about the
- type of the element being checked. Better backport this to 1.5 since
- nobody knows what the emitted code looks like since macros are used
- instead of functions.
- (cherry picked from commit 506c69a50e8d434b6b0c2c89b0402f220830644d)
- ---
- src/proto_http.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
- diff --git a/src/proto_http.c b/src/proto_http.c
- index 01fe62d..4a862b0 100644
- --- a/src/proto_http.c
- +++ b/src/proto_http.c
- @@ -2143,22 +2143,22 @@ int parse_qvalue(const char *qvalue, const char **end)
- {
- int q = 1000;
-
- - if (!isdigit(*qvalue))
- + if (!isdigit((unsigned char)*qvalue))
- goto out;
- q = (*qvalue++ - '0') * 1000;
-
- if (*qvalue++ != '.')
- goto out;
-
- - if (!isdigit(*qvalue))
- + if (!isdigit((unsigned char)*qvalue))
- goto out;
- q += (*qvalue++ - '0') * 100;
-
- - if (!isdigit(*qvalue))
- + if (!isdigit((unsigned char)*qvalue))
- goto out;
- q += (*qvalue++ - '0') * 10;
-
- - if (!isdigit(*qvalue))
- + if (!isdigit((unsigned char)*qvalue))
- goto out;
- q += (*qvalue++ - '0') * 1;
- out:
- @@ -11226,7 +11226,7 @@ static int sample_conv_q_prefered(const struct arg *args, struct sample *smp)
- while (1) {
-
- /* Jump spaces, quit if the end is detected. */
- - while (al < end && isspace(*al))
- + while (al < end && isspace((unsigned char)*al))
- al++;
- if (al >= end)
- break;
- @@ -11235,7 +11235,7 @@ static int sample_conv_q_prefered(const struct arg *args, struct sample *smp)
- token = al;
-
- /* Look for separator: isspace(), ',' or ';'. Next value if 0 length word. */
- - while (al < end && *al != ';' && *al != ',' && !isspace(*al))
- + while (al < end && *al != ';' && *al != ',' && !isspace((unsigned char)*al))
- al++;
- if (al == token)
- goto expect_comma;
- @@ -11264,7 +11264,7 @@ static int sample_conv_q_prefered(const struct arg *args, struct sample *smp)
- look_for_q:
-
- /* Jump spaces, quit if the end is detected. */
- - while (al < end && isspace(*al))
- + while (al < end && isspace((unsigned char)*al))
- al++;
- if (al >= end)
- goto process_value;
- @@ -11283,7 +11283,7 @@ look_for_q:
- al++;
-
- /* Jump spaces, process value if the end is detected. */
- - while (al < end && isspace(*al))
- + while (al < end && isspace((unsigned char)*al))
- al++;
- if (al >= end)
- goto process_value;
- @@ -11294,7 +11294,7 @@ look_for_q:
- al++;
-
- /* Jump spaces, process value if the end is detected. */
- - while (al < end && isspace(*al))
- + while (al < end && isspace((unsigned char)*al))
- al++;
- if (al >= end)
- goto process_value;
- @@ -11305,7 +11305,7 @@ look_for_q:
- al++;
-
- /* Jump spaces, process value if the end is detected. */
- - while (al < end && isspace(*al))
- + while (al < end && isspace((unsigned char)*al))
- al++;
- if (al >= end)
- goto process_value;
- --
- 1.8.5.5
|
