diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-04-09 05:16:19 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-04-09 05:16:19 +0400 |
commit | dabcdc15325702586501b5a6e401876f776d3c4c (patch) | |
tree | 7ecbd10dbe5b3ef905dcb5e4fd632a451605add8 /intern/utfconv/utfconv.h | |
parent | 35b483671188ca4bd418c3206809379aff179082 (diff) |
Warning Fixes - const correctness in unicode encoding, unused variables in blenlib, and some type conversions
This is from a patch that is in the tracker, but it leaves out a fix of BLI_gzopen which needs more work.
Diffstat (limited to 'intern/utfconv/utfconv.h')
-rw-r--r-- | intern/utfconv/utfconv.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h index 9c1693e3896..30c0c8a9069 100644 --- a/intern/utfconv/utfconv.h +++ b/intern/utfconv/utfconv.h @@ -38,14 +38,14 @@ extern "C" { * @param string-16 pointer to working utf-16 string * @return How many bytes must be allocated includeng NULL. */ -size_t count_utf_8_from_16(wchar_t * string16); +size_t count_utf_8_from_16(const wchar_t * string16); /** * Counts how many wchar_t (two byte) is requered for for future utf-16 string using utf-8 * @param string-8 pointer to working utf-8 string * @return How many bytes must be allocated includeng NULL. */ -size_t count_utf_16_from_8(char * string8); +size_t count_utf_16_from_8(const char * string8); /** * conv_utf_*** errors @@ -62,7 +62,7 @@ size_t count_utf_16_from_8(char * string8); * @params size8 the allocated size in bytes of out8 * @return Returns any errors occured during conversion. See the block above, */ -int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8); +int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8); /** * Converts utf-8 string to allocated utf-16 string @@ -71,7 +71,7 @@ int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8); * @params size16 the allocated size in wchar_t (two byte) of out16 * @return Returns any errors occured during conversion. See the block above, */ -int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16); +int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16); /** @@ -80,7 +80,7 @@ int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16); * @params add any additional size which will be allocated for new utf-8 string in bytes * @return New allocated and converted utf-8 string or NULL if in16 is 0. */ -char * alloc_utf_8_from_16(wchar_t * in16, size_t add); +char * alloc_utf_8_from_16(const wchar_t * in16, size_t add); /** * Allocates and converts the utf-16 string from utf-8 @@ -88,7 +88,7 @@ char * alloc_utf_8_from_16(wchar_t * in16, size_t add); * @params add any additional size which will be allocated for new utf-16 string in wchar_t (two bytes) * @return New allocated and converted utf-16 string or NULL if in8 is 0. */ -wchar_t * alloc_utf16_from_8(char * in8, size_t add); +wchar_t * alloc_utf16_from_8(const char * in8, size_t add); /* Easy allocation and conversion of new utf-16 string. New string has _16 suffix. Must be deallocated with UTF16_UN_ENCODE in right order*/ #define UTF16_ENCODE(in8str) if(1){\ |