Uri.h | Uri.h | |||
---|---|---|---|---|
skipping to change at line 344 | skipping to change at line 344 | |||
* | * | |||
* NOTE: If necessary the %URI becomes owner of all memory | * NOTE: If necessary the %URI becomes owner of all memory | |||
* behind the text pointed to. Text is duplicated in that case. | * behind the text pointed to. Text is duplicated in that case. | |||
* | * | |||
* @param uri %URI to normalize | * @param uri %URI to normalize | |||
* @return Error code or 0 on success | * @return Error code or 0 on success | |||
*/ | */ | |||
int URI_FUNC(NormalizeSyntax)(URI_TYPE(Uri) * uri); | int URI_FUNC(NormalizeSyntax)(URI_TYPE(Uri) * uri); | |||
/** | /** | |||
* Converts an absolute Unix filename to a %URI string. | * Converts a Unix filename to a %URI string. | |||
* The destination buffer must be large enough to hold | * The destination buffer must be large enough to hold 7 + 3 * len(filename | |||
* 7 + 3 * len(filename) + 1 characters. | ) + 1 | |||
* characters in case of an absolute filename or 3 * len(filename) + 1 in c | ||||
ase | ||||
* of a relative filename. | ||||
* | * | |||
* EXAMPLE | * EXAMPLE | |||
* Input: "/bin/bash" | * Input: "/bin/bash" | |||
* Output: "file:///bin/bash" | * Output: "file:///bin/bash" | |||
* | * | |||
* @param filename Unix filename to convert | * @param filename Unix filename to convert | |||
* @param uriString Destination to write %URI string to | * @param uriString Destination to write %URI string to | |||
* @return Error code or 0 on success | * @return Error code or 0 on success | |||
*/ | */ | |||
int URI_FUNC(UnixFilenameToUriString)(const URI_CHAR * filename, | int URI_FUNC(UnixFilenameToUriString)(const URI_CHAR * filename, | |||
URI_CHAR * uriString); | URI_CHAR * uriString); | |||
/** | /** | |||
* Converts an absolute Windows filename to a %URI string. | * Converts a Windows filename to a %URI string. | |||
* The destination buffer must be large enough to hold | * The destination buffer must be large enough to hold 8 + 3 * len(filename | |||
* 8 + 3 * len(filename) + 1 characters. | ) + 1 | |||
* characters in case of an absolute filename or 3 * len(filename) + 1 in c | ||||
ase | ||||
* of a relative filename. | ||||
* | * | |||
* EXAMPLE | * EXAMPLE | |||
* Input: "E:\\Documents and Settings" | * Input: "E:\\Documents and Settings" | |||
* Output: "file:///E:/Documents%20and%20Settings" | * Output: "file:///E:/Documents%20and%20Settings" | |||
* | * | |||
* @param filename Windows filename to convert | * @param filename Windows filename to convert | |||
* @param uriString Destination to write %URI string to | * @param uriString Destination to write %URI string to | |||
* @return Error code or 0 on success | * @return Error code or 0 on success | |||
*/ | */ | |||
int URI_FUNC(WindowsFilenameToUriString)(const URI_CHAR * filename, | int URI_FUNC(WindowsFilenameToUriString)(const URI_CHAR * filename, | |||
URI_CHAR * uriString); | URI_CHAR * uriString); | |||
/** | /** | |||
* Extracts an absolute Unix filename from a %URI string. | * Extracts a Unix filename from a %URI string. | |||
* The destination buffer must be large enough to hold | * The destination buffer must be large enough to hold len(uriString) + 1 - | |||
* len(uriString) + 1 - 7 characters. | 7 | |||
* characters in case of an absolute %URI or len(uriString) + 1 in case | ||||
* of a relative %URI. | ||||
* | * | |||
* @param uriString %URI string to convert | * @param uriString %URI string to convert | |||
* @param filename Destination to write filename to | * @param filename Destination to write filename to | |||
* @return Error code or 0 on success | * @return Error code or 0 on success | |||
*/ | */ | |||
int URI_FUNC(UriStringToUnixFilename)(const URI_CHAR * uriString, | int URI_FUNC(UriStringToUnixFilename)(const URI_CHAR * uriString, | |||
URI_CHAR * filename); | URI_CHAR * filename); | |||
/** | /** | |||
* Extracts an absolute Windows filename from a %URI string. | * Extracts a Windows filename from a %URI string. | |||
* The destination buffer must be large enough to hold | * The destination buffer must be large enough to hold len(uriString) + 1 - | |||
* len(uriString) + 1 - 8 characters. | 8 | |||
* characters in case of an absolute %URI or len(uriString) + 1 in case | ||||
* of a relative %URI. | ||||
* | * | |||
* @param uriString %URI string to convert | * @param uriString %URI string to convert | |||
* @param filename Destination to write filename to | * @param filename Destination to write filename to | |||
* @return Error code or 0 on success | * @return Error code or 0 on success | |||
*/ | */ | |||
int URI_FUNC(UriStringToWindowsFilename)(const URI_CHAR * uriString, | int URI_FUNC(UriStringToWindowsFilename)(const URI_CHAR * uriString, | |||
URI_CHAR * filename); | URI_CHAR * filename); | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
End of changes. 4 change blocks. | ||||
12 lines changed or deleted | 22 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 6 | #define URI_VER_MINOR 6 | |||
#define URI_VER_RELEASE 3 | #define URI_VER_RELEASE 4 | |||
#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 | |||