utils/macros.h: Add <ctype.h> and `foocmp' helper macros.

[mLib] / codec / url.c

diff --git a/codec/url.c b/codec/url.c
index 0de87ae1fff337ab5244ed8a348908d694de71f7..eecfe820dd0180ac8cb31b68e19ad7a3d1b2b095 100644 (file)
--- a/codec/url.c
+++ b/codec/url.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "dstr.h"
 #include <string.h>
 
 #include "dstr.h"

+#include "macros.h"

 #include "url.h"
 
 /*----- Main code ---------------------------------------------------------*/
 #include "url.h"
 
 /*----- Main code ---------------------------------------------------------*/


@@ -66,8 +67,8 @@ static void encode(url_ectx *ctx, dstr *d, const char *p)
       case ' ': DPUTC(d, '+');
        break;
       default:
       case ' ': DPUTC(d, '+');
        break;
       default:

-       if (isspace((unsigned char)*p)) goto unsafe;
-       else if (isalnum((unsigned char)*p)) goto safe;
+       if (ISSPACE(*p)) goto unsafe;
+       else if (ISALNUM(*p)) goto safe;

        else if (ctx->f&URLF_LAX) goto safe;
        else goto unsafe;
       case '/': case '~':
        else if (ctx->f&URLF_LAX) goto safe;
        else goto unsafe;
       case '/': case '~':