summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2018-09-08 10:26:34 +0200
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2018-09-08 10:26:34 +0200
commit04233c1001f3040c0c7811db5178974538ee3680 (patch)
tree6501c4625396503fa7a2df84540b23a93739c441 /include
parente94f3be22cd927eb2b5d9554eae2032a971c7e7e (diff)
parentd7dff546ec47157ba13806d91ff7e6e4836acaf6 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'include')
-rw-r--r--include/uriparser/Uri.h30
-rw-r--r--include/uriparser/UriBase.h2
2 files changed, 16 insertions, 16 deletions
diff --git a/include/uriparser/Uri.h b/include/uriparser/Uri.h
index a3f7914..f4600fb 100644
--- a/include/uriparser/Uri.h
+++ b/include/uriparser/Uri.h
@@ -1,4 +1,4 @@
-/* f9ca23a99fc1c8ff610e2bdc0bff3c4bb4d883ccbff5851fe7a1398f9b6aca57 (0.8.5+)
+/* 5afca6d8abb5d1a22b4e28c912538e6729692afc98f089d9e538ca01c43ab805 (0.8.6+)
*
* uriparser - RFC 3986 URI parsing library
*
@@ -177,7 +177,7 @@ typedef struct URI_TYPE(UriStruct) {
*/
typedef struct URI_TYPE(ParserStateStruct) {
URI_TYPE(Uri) * uri; /**< Plug in the %URI structure to be filled while parsing here */
- int errorCode; /**< Code identifying the occured error */
+ int errorCode; /**< Code identifying the error which occurred */
const URI_CHAR * errorPos; /**< Pointer to position in case of a syntax error */
void * reserved; /**< Reserved to the parser */
@@ -258,8 +258,8 @@ void URI_FUNC(FreeUriMembers)(URI_TYPE(Uri) * uri);
* @param inFirst <b>IN</b>: Pointer to first character of the input text
* @param inAfterLast <b>IN</b>: Pointer after the last character of the input text
* @param out <b>OUT</b>: Encoded text destination
- * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
- * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
+ * @param spaceToPlus <b>IN</b>: Whether to convert ' ' to '+' or not
+ * @param normalizeBreaks <b>IN</b>: Whether to convert CR and LF to CR-LF or not.
* @return Position of terminator in output string
*
* @see uriEscapeA
@@ -282,8 +282,8 @@ URI_CHAR * URI_FUNC(EscapeEx)(const URI_CHAR * inFirst,
*
* @param in <b>IN</b>: Text source
* @param out <b>OUT</b>: Encoded text destination
- * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
- * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
+ * @param spaceToPlus <b>IN</b>: Whether to convert ' ' to '+' or not
+ * @param normalizeBreaks <b>IN</b>: Whether to convert CR and LF to CR-LF or not.
* @return Position of terminator in output string
*
* @see uriEscapeExA
@@ -381,9 +381,9 @@ int URI_FUNC(AddBaseUriEx)(URI_TYPE(Uri) * absoluteDest,
/**
* Tries to make a relative %URI (a reference) from an
- * absolute %URI and a given base %URI. This can only work if
- * the absolute %URI shares scheme and authority with
- * the base %URI. If it does not the result will still be
+ * absolute %URI and a given base %URI. The resulting %URI is going to be
+ * relative if the absolute %URI and base %UI share both scheme and authority.
+ * If that is not the case, the result will still be
* an absolute URI (with scheme part if necessary).
* NOTE: On success you have to call uriFreeUriMembersA on
* \p dest manually later.
@@ -612,8 +612,8 @@ int URI_FUNC(ComposeQueryCharsRequired)(const URI_TYPE(QueryList) * queryList,
*
* @param queryList <b>IN</b>: Query list to measure
* @param charsRequired <b>OUT</b>: Length of the string representation in characters <b>excluding</b> terminator
- * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
- * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
+ * @param spaceToPlus <b>IN</b>: Whether to convert ' ' to '+' or not
+ * @param normalizeBreaks <b>IN</b>: Whether to convert CR and LF to CR-LF or not.
* @return Error code or 0 on success
*
* @see uriComposeQueryCharsRequiredA
@@ -656,8 +656,8 @@ int URI_FUNC(ComposeQuery)(URI_CHAR * dest,
* @param queryList <b>IN</b>: Query list to convert
* @param maxChars <b>IN</b>: Maximum number of characters to copy <b>including</b> terminator
* @param charsWritten <b>OUT</b>: Number of characters written, can be lower than maxChars even if the query list is too long!
- * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
- * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
+ * @param spaceToPlus <b>IN</b>: Whether to convert ' ' to '+' or not
+ * @param normalizeBreaks <b>IN</b>: Whether to convert CR and LF to CR-LF or not.
* @return Error code or 0 on success
*
* @see uriComposeQueryA
@@ -700,8 +700,8 @@ int URI_FUNC(ComposeQueryMalloc)(URI_CHAR ** dest,
*
* @param dest <b>OUT</b>: Output destination
* @param queryList <b>IN</b>: Query list to convert
- * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
- * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
+ * @param spaceToPlus <b>IN</b>: Whether to convert ' ' to '+' or not
+ * @param normalizeBreaks <b>IN</b>: Whether to convert CR and LF to CR-LF or not.
* @return Error code or 0 on success
*
* @see uriComposeQueryMallocA
diff --git a/include/uriparser/UriBase.h b/include/uriparser/UriBase.h
index 45ba5ab..0c2a5e7 100644
--- a/include/uriparser/UriBase.h
+++ b/include/uriparser/UriBase.h
@@ -55,7 +55,7 @@
/* Version */
#define URI_VER_MAJOR 0
#define URI_VER_MINOR 8
-#define URI_VER_RELEASE 5
+#define URI_VER_RELEASE 6
#define URI_VER_SUFFIX_ANSI ""
#define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)