aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/setup_once.h1
-rw-r--r--lib/cookie.c11
-rw-r--r--lib/setup_once.h1
3 files changed, 7 insertions, 6 deletions
diff --git a/ares/setup_once.h b/ares/setup_once.h
index 0ff1d65a1..6cfa526f7 100644
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -115,6 +115,7 @@
*/
#define ISSPACE(x) (isspace((int) ((unsigned char)x)))
+#define ISBLANK(x) (isblank((int) ((unsigned char)x)))
#define ISDIGIT(x) (isdigit((int) ((unsigned char)x)))
#define ISALNUM(x) (isalnum((int) ((unsigned char)x)))
#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
diff --git a/lib/cookie.c b/lib/cookie.c
index 2856ad882..41a366d2d 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -102,7 +102,6 @@ Example set of cookies:
#include "memdebug.h"
#endif
-#define my_isspace(x) ((x == ' ') || (x == '\t'))
static void freecookie(struct Cookie *co)
{
@@ -206,7 +205,7 @@ Curl_cookie_add(struct SessionHandle *data,
semiptr=strchr(lineptr, ';'); /* first, find a semicolon */
- while(*lineptr && my_isspace(*lineptr))
+ while(*lineptr && ISBLANK(*lineptr))
lineptr++;
ptr = lineptr;
@@ -229,14 +228,14 @@ Curl_cookie_add(struct SessionHandle *data,
/* Strip off trailing whitespace from the 'what' */
size_t len=strlen(what);
- while(len && my_isspace(what[len-1])) {
+ while(len && ISBLANK(what[len-1])) {
what[len-1]=0;
len--;
}
/* Skip leading whitespace from the 'what' */
whatptr=what;
- while(my_isspace(*whatptr)) {
+ while(*whatptr && ISBLANK(*whatptr)) {
whatptr++;
}
@@ -378,7 +377,7 @@ Curl_cookie_add(struct SessionHandle *data,
}
ptr=semiptr+1;
- while(ptr && *ptr && my_isspace(*ptr))
+ while(ptr && *ptr && ISBLANK(*ptr))
ptr++;
semiptr=strchr(ptr, ';'); /* now, find the next semicolon */
@@ -702,7 +701,7 @@ struct CookieInfo *Curl_cookie_init(struct SessionHandle *data,
lineptr=line;
headerline=FALSE;
}
- while(*lineptr && my_isspace(*lineptr))
+ while(*lineptr && ISBLANK(*lineptr))
lineptr++;
Curl_cookie_add(data, c, headerline, lineptr, NULL, NULL);
diff --git a/lib/setup_once.h b/lib/setup_once.h
index 3d3235ede..445bb970b 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -122,6 +122,7 @@
*/
#define ISSPACE(x) (isspace((int) ((unsigned char)x)))
+#define ISBLANK(x) (isblank((int) ((unsigned char)x)))
#define ISDIGIT(x) (isdigit((int) ((unsigned char)x)))
#define ISALNUM(x) (isalnum((int) ((unsigned char)x)))
#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))