1 files changed, 12 insertions, 20 deletions

diff --git a/scan_urlencoded_query.c b/scan_urlencoded_query.c
index 7aeabab..6ba7808 100644
--- a/scan_urlencoded_query.c
+++ b/scan_urlencoded_query.c
@@ -1,13 +1,5 @@
 #include "scan.h"
-
-#define BREAK_AT_QUESTIONMARK (1<<0)
-#define BREAK_AT_WHITESPACE   (1<<1)
-#define BREAK_AT_AMPERSAND    (1<<2)
-#define BREAK_AT_EQUALSIGN    (1<<3)
-
-#define SCAN_PATH             ( BREAK_AT_QUESTIONMARK | BREAK_AT_WHITESPACE )
-#define SCAN_SEARCHPATH_PARAM ( BREAK_AT_EQUALSIGN )
-#define SCAN_SEARCHPATH_VALUE ( BREAK_AT_AMPERSAND | BREAK_AT_WHITESPACE )
+#include "scan_urlencoded_query.h"
 
 // Idea is to do a in place replacement or guarantee at least
 // strlen( string ) bytes in deststring
@@ -17,19 +9,19 @@
 // we add '%' to the matrix to not stop at encoded chars.
 
 static const unsigned char reserved_matrix[] = { 0xA2, 0x63, 0xFF, 0x03, 0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x47};
-inline int is_unreserved( unsigned char c ) const {
+inline int is_unreserved( unsigned char c ) {
   if( ( c <= 32 ) || ( c >= 127 ) ) return 0; return 1&(reserved_matrix[(c-32)>>3]>>(c&7));
 }
 
 size_t scan_urlencoded_query(char **string, char *deststring, int flags) {
-  register const unsigned char* s=*(const unsigned char*) string;
-  const unsigned char *d = deststring;
+  register const unsigned char* s=*(const unsigned char**) string;
+  unsigned char *d = (unsigned char*)deststring;
   register unsigned char b, c;
 
   while ( is_unreserved( c = *s++) ) {
     if (c=='%') {
-      if( ( c = scan_fromhex(*s++) ) < 0 ) return -1;
-      if( ( b = scan_fromhex(*s++) ) < 0 ) return -1;
+      if( ( c = scan_fromhex(*s++) ) == 0xff ) return -1;
+      if( ( b = scan_fromhex(*s++) ) == 0xff ) return -1;
       c=(c<<4)|b;
     }
     *d++ = c;
@@ -37,21 +29,21 @@ size_t scan_urlencoded_query(char **string, char *deststring, int flags) {
 
   switch( c ) {
   case 0: case '\r': case '\n': case ' ':
-    if ( flags & BREAK_AT_WHITESPACE == 0 ) return -1;
+    if ( ( flags & BREAK_AT_WHITESPACE ) == 0 ) return -1;
     break;
   case '?':
-    if ( flags & BREAK_AT_QUESTIONMARK == 0 ) return -1;
+    if ( ( flags & BREAK_AT_QUESTIONMARK ) == 0 ) return -1;
     break;
   case '=':
-    if ( flags & BREAK_AT_EQUALSIGN == 0 ) return -1;
+    if ( ( flags & BREAK_AT_EQUALSIGN ) == 0 ) return -1;
     break;
   case '&':
-    if ( flags & BREAK_AT_AMPERSAND == 0 ) return -1;
+    if ( ( flags & BREAK_AT_AMPERSAND ) == 0 ) return -1;
     break;
   default:
     return -1;
   }
 
-  *string = s;
-  return d - deststring;
+  *string = (char *)s;
+  return d - (unsigned char*)deststring;
 }