[Bf-blender-cvs] [1206fae] master: Warning cleanup:

Antony Riakiotakis noreply at git.blender.org
Sat Mar 22 15:41:56 CET 2014


Commit: 1206faeb99ab6c09baeb39ce0ed89539621ccebe
Author: Antony Riakiotakis
Date:   Sat Mar 22 14:41:38 2014 +0200
https://developer.blender.org/rB1206faeb99ab6c09baeb39ce0ed89539621ccebe

Warning cleanup:

* Comparison in utf detection code always failed
* Cast to integer to silence grumpy 64bit gcc

===================================================================

M	intern/utfconv/utfconv.c
M	source/blender/blenlib/intern/path_util.c

===================================================================

diff --git a/intern/utfconv/utfconv.c b/intern/utfconv/utfconv.c
index 7f7a612..e5f8756 100644
--- a/intern/utfconv/utfconv.c
+++ b/intern/utfconv/utfconv.c
@@ -170,7 +170,7 @@ int conv_utf_8_to_16(const char *in8, wchar_t *out16, size_t size16)
 {
 	char u;
 	char type = 0;
-	wchar_t u32 = 0;
+	unsigned int u32 = 0;
 	wchar_t *out16end = out16 + size16;
 	int err = 0;
 	if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN;
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index e56ac6f..594f9bf 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -2068,7 +2068,7 @@ static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name
 	if (GetModuleFileNameW(0, fullname_16, maxlen)) {
 		conv_utf_16_to_8(fullname_16, fullname, maxlen);
 		if (!BLI_exists(fullname)) {
-			printf("path can't be found: \"%.*s\"\n", maxlen, fullname);
+			printf("path can't be found: \"%.*s\"\n", (int)maxlen, fullname);
 			MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
 		}
 		MEM_freeN(fullname_16);




More information about the Bf-blender-cvs mailing list