Uri.h   Uri.h 
skipping to change at line 307 skipping to change at line 307
* *
* @see uriUnescapeInPlaceExA * @see uriUnescapeInPlaceExA
* @see uriEscapeA * @see uriEscapeA
* @since 0.3.0 * @since 0.3.0
*/ */
const URI_CHAR * URI_FUNC(UnescapeInPlace)(URI_CHAR * inout); const URI_CHAR * URI_FUNC(UnescapeInPlace)(URI_CHAR * inout);
/** /**
* Performs reference resolution as described in * Performs reference resolution as described in
* <a href="http://tools.ietf.org/html/rfc3986#section-5.2.2">section 5.2.2 of RFC 3986</a>. * <a href="http://tools.ietf.org/html/rfc3986#section-5.2.2">section 5.2.2 of RFC 3986</a>.
* NOTE: On success you have to call uriFreeUriMembersA on \p absoluteDest manually later.
* *
* @param absoluteDest <b>OUT</b>: Result %URI * @param absoluteDest <b>OUT</b>: Result %URI
* @param relativeSource <b>IN</b>: Reference to resolve * @param relativeSource <b>IN</b>: Reference to resolve
* @param absoluteBase <b>IN</b>: Base %URI to apply * @param absoluteBase <b>IN</b>: Base %URI to apply
* @return Error code or 0 on success * @return Error code or 0 on success
* *
* @see uriRemoveBaseUriA * @see uriRemoveBaseUriA
* @since 0.4.0 * @since 0.4.0
*/ */
int URI_FUNC(AddBaseUri)(URI_TYPE(Uri) * absoluteDest, int URI_FUNC(AddBaseUri)(URI_TYPE(Uri) * absoluteDest,
const URI_TYPE(Uri) * relativeSource, const URI_TYPE(Uri) * relativeSource,
const URI_TYPE(Uri) * absoluteBase); const URI_TYPE(Uri) * absoluteBase);
/** /**
* Tries to make a relative %URI (a reference) from an * Tries to make a relative %URI (a reference) from an
* absolute %URI and a given base %URI. This can only work if * absolute %URI and a given base %URI. This can only work if
* the absolute %URI shares scheme and authority with * the absolute %URI shares scheme and authority with
* the base %URI. If it does not the result will still be * the base %URI. If it does not the result will still be
* an absolute URI (with scheme part if necessary). * an absolute URI (with scheme part if necessary).
* NOTE: On success you have to call uriFreeUriMembersA on
* \p dest manually later.
* *
* @param dest <b>OUT</b>: Result %URI * @param dest <b>OUT</b>: Result %URI
* @param absoluteSource <b>IN</b>: Absolute %URI to make relative * @param absoluteSource <b>IN</b>: Absolute %URI to make relative
* @param absoluteBase <b>IN</b>: Base %URI * @param absoluteBase <b>IN</b>: Base %URI
* @param domainRootMode <b>IN</b>: Create %URI with path relative to dom ain root * @param domainRootMode <b>IN</b>: Create %URI with path relative to dom ain root
* @return Error code or 0 on success * @return Error code or 0 on success
* *
* @see uriAddBaseUriA * @see uriAddBaseUriA
* @since 0.5.2 * @since 0.5.2
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 UriBase.h   UriBase.h 
skipping to change at line 54 skipping to change at line 54
#ifndef URI_BASE_H #ifndef URI_BASE_H
#define URI_BASE_H 1 #define URI_BASE_H 1
/* Version helper macro */ /* Version helper macro */
#define URI_ANSI_TO_UNICODE(x) L##x #define URI_ANSI_TO_UNICODE(x) L##x
/* Version */ /* Version */
#define URI_VER_MAJOR 0 #define URI_VER_MAJOR 0
#define URI_VER_MINOR 7 #define URI_VER_MINOR 7
#define URI_VER_RELEASE 1 #define URI_VER_RELEASE 2
#define URI_VER_SUFFIX_ANSI "" #define URI_VER_SUFFIX_ANSI ""
#define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI) #define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)
/* More version helper macros */ /* More version helper macros */
#define URI_INT_TO_ANSI_HELPER(x) #x #define URI_INT_TO_ANSI_HELPER(x) #x
#define URI_INT_TO_ANSI(x) URI_INT_TO_ANSI_HELPER(x) #define URI_INT_TO_ANSI(x) URI_INT_TO_ANSI_HELPER(x)
#define URI_INT_TO_UNICODE_HELPER(x) URI_ANSI_TO_UNICODE(#x) #define URI_INT_TO_UNICODE_HELPER(x) URI_ANSI_TO_UNICODE(#x)
#define URI_INT_TO_UNICODE(x) URI_INT_TO_UNICODE_HELPER(x) #define URI_INT_TO_UNICODE(x) URI_INT_TO_UNICODE_HELPER(x)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/