New upstream version 1.0.1+dfsgupstream/1.0.1+dfsgupstream

1 files changed, 191 insertions, 213 deletions

diff --git a/src/UriIp4.c b/src/UriIp4.c
index a794265..ae61141 100644
--- a/src/UriIp4.c
+++ b/src/UriIp4.c
@@ -47,97 +47,94 @@
 #include <uriparser/UriDefsConfig.h>
 #if (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE))
 /* Include SELF twice */
-# ifdef URI_ENABLE_ANSI
-#  define URI_PASS_ANSI 1
-#  include "UriIp4.c"
-#  undef URI_PASS_ANSI
-# endif
-# ifdef URI_ENABLE_UNICODE
-#  define URI_PASS_UNICODE 1
-#  include "UriIp4.c"
-#  undef URI_PASS_UNICODE
-# endif
+#  ifdef URI_ENABLE_ANSI
+#    define URI_PASS_ANSI 1
+#    include "UriIp4.c"
+#    undef URI_PASS_ANSI
+#  endif
+#  ifdef URI_ENABLE_UNICODE
+#    define URI_PASS_UNICODE 1
+#    include "UriIp4.c"
+#    undef URI_PASS_UNICODE
+#  endif
 #else
-# ifdef URI_PASS_ANSI
-#  include <uriparser/UriDefsAnsi.h>
-# else
-#  include <uriparser/UriDefsUnicode.h>
-# endif
-
-
-
-#ifndef URI_DOXYGEN
-# include <uriparser/UriIp4.h>
-# include "UriIp4Base.h"
-# include <uriparser/UriBase.h>
-#endif
-
-
+#  ifdef URI_PASS_ANSI
+#    include <uriparser/UriDefsAnsi.h>
+#  else
+#    include <uriparser/UriDefsUnicode.h>
+#  endif
+
+#  ifndef URI_DOXYGEN
+#    include <uriparser/UriIp4.h>
+#    include "UriIp4Base.h"
+#    include <uriparser/UriBase.h>
+#    include "UriSets.h"
+#  endif
 
 /* Prototypes */
 static const URI_CHAR * URI_FUNC(ParseDecOctet)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast);
+                                                const URI_CHAR * first,
+                                                const URI_CHAR * afterLast);
 static const URI_CHAR * URI_FUNC(ParseDecOctetOne)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast);
+                                                   const URI_CHAR * first,
+                                                   const URI_CHAR * afterLast);
 static const URI_CHAR * URI_FUNC(ParseDecOctetTwo)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast);
+                                                   const URI_CHAR * first,
+                                                   const URI_CHAR * afterLast);
 static const URI_CHAR * URI_FUNC(ParseDecOctetThree)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast);
+                                                     const URI_CHAR * first,
+                                                     const URI_CHAR * afterLast);
 static const URI_CHAR * URI_FUNC(ParseDecOctetFour)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast);
-
-
+                                                    const URI_CHAR * first,
+                                                    const URI_CHAR * afterLast);
 
 /*
  * [ipFourAddress]->[decOctet]<.>[decOctet]<.>[decOctet]<.>[decOctet]
  */
-int URI_FUNC(ParseIpFourAddress)(unsigned char * octetOutput,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	const URI_CHAR * after;
-	UriIp4Parser parser;
-
-	/* Essential checks */
-	if ((octetOutput == NULL) || (first == NULL)
-			|| (afterLast <= first)) {
-		return URI_ERROR_SYNTAX;
-	}
-
-	/* Reset parser */
-	parser.stackCount = 0;
-
-	/* Octet #1 */
-	after = URI_FUNC(ParseDecOctet)(&parser, first, afterLast);
-	if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
-		return URI_ERROR_SYNTAX;
-	}
-	uriStackToOctet(&parser, octetOutput);
-
-	/* Octet #2 */
-	after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
-	if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
-		return URI_ERROR_SYNTAX;
-	}
-	uriStackToOctet(&parser, octetOutput + 1);
-
-	/* Octet #3 */
-	after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
-	if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
-		return URI_ERROR_SYNTAX;
-	}
-	uriStackToOctet(&parser, octetOutput + 2);
-
-	/* Octet #4 */
-	after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
-	if (after != afterLast) {
-		return URI_ERROR_SYNTAX;
-	}
-	uriStackToOctet(&parser, octetOutput + 3);
-
-	return URI_SUCCESS;
+int URI_FUNC(ParseIpFourAddress)(unsigned char * octetOutput, const URI_CHAR * first,
+                                 const URI_CHAR * afterLast) {
+    const URI_CHAR * after;
+    UriIp4Parser parser;
+
+    /* Essential checks */
+    if ((octetOutput == NULL) || (first == NULL) || (afterLast <= first)) {
+        return URI_ERROR_SYNTAX;
+    }
+
+    /* Reset parser */
+    parser.stackCount = 0;
+
+    /* Octet #1 */
+    after = URI_FUNC(ParseDecOctet)(&parser, first, afterLast);
+    if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
+        return URI_ERROR_SYNTAX;
+    }
+    uriStackToOctet(&parser, octetOutput);
+
+    /* Octet #2 */
+    after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
+    if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
+        return URI_ERROR_SYNTAX;
+    }
+    uriStackToOctet(&parser, octetOutput + 1);
+
+    /* Octet #3 */
+    after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
+    if ((after == NULL) || (after >= afterLast) || (*after != _UT('.'))) {
+        return URI_ERROR_SYNTAX;
+    }
+    uriStackToOctet(&parser, octetOutput + 2);
+
+    /* Octet #4 */
+    after = URI_FUNC(ParseDecOctet)(&parser, after + 1, afterLast);
+    if (after != afterLast) {
+        return URI_ERROR_SYNTAX;
+    }
+    uriStackToOctet(&parser, octetOutput + 3);
+
+    return URI_SUCCESS;
 }
 
-
-
 /*
  * [decOctet]-><0>
  * [decOctet]-><1>[decOctetOne]
@@ -151,72 +148,63 @@ int URI_FUNC(ParseIpFourAddress)(unsigned char * octetOutput,
  * [decOctet]-><9>[decOctetThree]
  */
 static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctet)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	if (first >= afterLast) {
-		return NULL;
-	}
-
-	switch (*first) {
-	case _UT('0'):
-		uriPushToStack(parser, 0);
-		return first + 1;
-
-	case _UT('1'):
-		uriPushToStack(parser, 1);
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetOne)(parser, first + 1, afterLast);
-
-	case _UT('2'):
-		uriPushToStack(parser, 2);
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetTwo)(parser, first + 1, afterLast);
-
-	case _UT('3'):
-	case _UT('4'):
-	case _UT('5'):
-	case _UT('6'):
-	case _UT('7'):
-	case _UT('8'):
-	case _UT('9'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1, afterLast);
-
-	default:
-		return NULL;
-	}
+                                                           const URI_CHAR * first,
+                                                           const URI_CHAR * afterLast) {
+    if (first >= afterLast) {
+        return NULL;
+    }
+
+    switch (*first) {
+    case _UT('0'):
+        uriPushToStack(parser, 0);
+        return first + 1;
+
+    case _UT('1'):
+        uriPushToStack(parser, 1);
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetOne)(parser, first + 1, afterLast);
+
+    case _UT('2'):
+        uriPushToStack(parser, 2);
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetTwo)(parser, first + 1, afterLast);
+
+    case _UT('3'):
+    case _UT('4'):
+    case _UT('5'):
+    case _UT('6'):
+    case _UT('7'):
+    case _UT('8'):
+    case _UT('9'):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1,
+                                                              afterLast);
+
+    default:
+        return NULL;
+    }
 }
 
-
-
 /*
  * [decOctetOne]-><NULL>
  * [decOctetOne]->[DIGIT][decOctetThree]
  */
-static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetOne)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	if (first >= afterLast) {
-		return afterLast;
-	}
-
-	switch (*first) {
-	case _UT('0'):
-	case _UT('1'):
-	case _UT('2'):
-	case _UT('3'):
-	case _UT('4'):
-	case _UT('5'):
-	case _UT('6'):
-	case _UT('7'):
-	case _UT('8'):
-	case _UT('9'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1, afterLast);
-
-	default:
-		return first;
-	}
+static URI_INLINE const URI_CHAR *
+URI_FUNC(ParseDecOctetOne)(UriIp4Parser * parser, const URI_CHAR * first,
+                           const URI_CHAR * afterLast) {
+    if (first >= afterLast) {
+        return afterLast;
+    }
+
+    switch (*first) {
+    case URI_SET_DIGIT(_UT):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1,
+                                                              afterLast);
+
+    default:
+        return first;
+    }
 }
 
-
-
 /*
  * [decOctetTwo]-><NULL>
  * [decOctetTwo]-><0>[decOctetThree]
@@ -229,71 +217,62 @@ static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetOne)(UriIp4Parser * par
  * [decOctetTwo]-><7>
  * [decOctetTwo]-><8>
  * [decOctetTwo]-><9>
-*/
-static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetTwo)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	if (first >= afterLast) {
-		return afterLast;
-	}
-
-	switch (*first) {
-	case _UT('0'):
-	case _UT('1'):
-	case _UT('2'):
-	case _UT('3'):
-	case _UT('4'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1, afterLast);
-
-	case _UT('5'):
-		uriPushToStack(parser, 5);
-		return (const URI_CHAR *)URI_FUNC(ParseDecOctetFour)(parser, first + 1, afterLast);
-
-	case _UT('6'):
-	case _UT('7'):
-	case _UT('8'):
-	case _UT('9'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return first + 1;
-
-	default:
-		return first;
-	}
+ */
+static URI_INLINE const URI_CHAR *
+URI_FUNC(ParseDecOctetTwo)(UriIp4Parser * parser, const URI_CHAR * first,
+                           const URI_CHAR * afterLast) {
+    if (first >= afterLast) {
+        return afterLast;
+    }
+
+    switch (*first) {
+    case _UT('0'):
+    case _UT('1'):
+    case _UT('2'):
+    case _UT('3'):
+    case _UT('4'):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetThree)(parser, first + 1,
+                                                              afterLast);
+
+    case _UT('5'):
+        uriPushToStack(parser, 5);
+        return (const URI_CHAR *)URI_FUNC(ParseDecOctetFour)(parser, first + 1,
+                                                             afterLast);
+
+    case _UT('6'):
+    case _UT('7'):
+    case _UT('8'):
+    case _UT('9'):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return first + 1;
+
+    default:
+        return first;
+    }
 }
 
-
-
 /*
  * [decOctetThree]-><NULL>
  * [decOctetThree]->[DIGIT]
  */
-static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetThree)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	if (first >= afterLast) {
-		return afterLast;
-	}
-
-	switch (*first) {
-	case _UT('0'):
-	case _UT('1'):
-	case _UT('2'):
-	case _UT('3'):
-	case _UT('4'):
-	case _UT('5'):
-	case _UT('6'):
-	case _UT('7'):
-	case _UT('8'):
-	case _UT('9'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return first + 1;
-
-	default:
-		return first;
-	}
+static URI_INLINE const URI_CHAR *
+URI_FUNC(ParseDecOctetThree)(UriIp4Parser * parser, const URI_CHAR * first,
+                             const URI_CHAR * afterLast) {
+    if (first >= afterLast) {
+        return afterLast;
+    }
+
+    switch (*first) {
+    case URI_SET_DIGIT(_UT):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return first + 1;
+
+    default:
+        return first;
+    }
 }
 
-
-
 /*
  * [decOctetFour]-><NULL>
  * [decOctetFour]-><0>
@@ -303,27 +282,26 @@ static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetThree)(UriIp4Parser * p
  * [decOctetFour]-><4>
  * [decOctetFour]-><5>
  */
-static URI_INLINE const URI_CHAR * URI_FUNC(ParseDecOctetFour)(UriIp4Parser * parser,
-		const URI_CHAR * first, const URI_CHAR * afterLast) {
-	if (first >= afterLast) {
-		return afterLast;
-	}
-
-	switch (*first) {
-	case _UT('0'):
-	case _UT('1'):
-	case _UT('2'):
-	case _UT('3'):
-	case _UT('4'):
-	case _UT('5'):
-		uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
-		return first + 1;
-
-	default:
-		return first;
-	}
+static URI_INLINE const URI_CHAR *
+URI_FUNC(ParseDecOctetFour)(UriIp4Parser * parser, const URI_CHAR * first,
+                            const URI_CHAR * afterLast) {
+    if (first >= afterLast) {
+        return afterLast;
+    }
+
+    switch (*first) {
+    case _UT('0'):
+    case _UT('1'):
+    case _UT('2'):
+    case _UT('3'):
+    case _UT('4'):
+    case _UT('5'):
+        uriPushToStack(parser, (unsigned char)(9 + *first - _UT('9')));
+        return first + 1;
+
+    default:
+        return first;
+    }
 }
 
-
-
 #endif