[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45554] trunk/blender: code cleanup: quiet some mingw warnings.

[Campbell Barton]

Revision: 45554
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45554
Author:   campbellbarton
Date:     2012-04-12 02:50:21 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
code cleanup: quiet some mingw warnings.

Modified Paths:
--------------
    trunk/blender/intern/utfconv/utfconv.c
    trunk/blender/source/blender/blenlib/BLI_winstuff.h
    trunk/blender/source/blender/blenlib/intern/winstuff.c

Modified: trunk/blender/intern/utfconv/utfconv.c
===================================================================
--- trunk/blender/intern/utfconv/utfconv.c	2012-04-12 02:37:28 UTC (rev 45553)
+++ trunk/blender/intern/utfconv/utfconv.c	2012-04-12 02:50:21 UTC (rev 45554)
@@ -34,7 +34,7 @@
 		return 0;
 	}
 
-	for (i = 0; u = string16[i]; i++) {
+    for (i = 0; (u = string16[i]); i++) {
 		if (u < 0x0080) {
 			count += 1;
 		}

Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h	2012-04-12 02:37:28 UTC (rev 45553)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h	2012-04-12 02:50:21 UTC (rev 45554)
@@ -140,7 +140,7 @@
 int closedir (DIR *dp);
 void get_default_root(char *root);
 int check_file_chars(char *filename);
-char *dirname(char *path);
+const char *dirname(char *path);
 
 int BLI_getInstallationDir(char *str);
 

Modified: trunk/blender/source/blender/blenlib/intern/winstuff.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/winstuff.c	2012-04-12 02:37:28 UTC (rev 45553)
+++ trunk/blender/source/blender/blenlib/intern/winstuff.c	2012-04-12 02:50:21 UTC (rev 45554)
@@ -46,13 +46,14 @@
 
 #define WIN32_SKIP_HKEY_PROTECTION		// need to use HKEY
 #include "BLI_winstuff.h"
+#include "BLI_utildefines.h"
 
 #include "utf_winfunc.h"
 #include "utfconv.h"
 
  /* FILE_MAXDIR + FILE_MAXFILE */
 
-int BLI_getInstallationDir( char * str )
+int BLI_getInstallationDir(char * str)
 {
 	char dir[FILE_MAXDIR];
 	int a;
@@ -89,7 +90,7 @@
 	char BlPath[MAX_PATH];
 	char InstallDir[FILE_MAXDIR];
 	char SysDir[FILE_MAXDIR];
-	const char* ThumbHandlerDLL;
+    const char *ThumbHandlerDLL;
 	char RegCmd[MAX_PATH*2];
 	char MBox[256];
 	BOOL IsWOW64;
@@ -172,7 +173,7 @@
 
 DIR *opendir (const char *path)
 {
-	wchar_t * path_16 = alloc_utf16_from_8(path, 0);
+    wchar_t *path_16 = alloc_utf16_from_8(path, 0);
 
 	if (GetFileAttributesW(path_16) & FILE_ATTRIBUTE_DIRECTORY) {
 		DIR *newd= MEM_mallocN(sizeof(DIR), "opendir");
@@ -194,20 +195,20 @@
 	}
 }
 
-static char * BLI_alloc_utf_8_from_16(wchar_t * in16, size_t add)
+static char *BLI_alloc_utf_8_from_16(wchar_t *in16, size_t add)
 {
 	size_t bsize = count_utf_8_from_16(in16);
-	char * out8 = NULL;
+    char *out8 = NULL;
 	if (!bsize) return NULL;
 	out8 = (char*)MEM_mallocN(sizeof(char) * (bsize + add),"UTF-8 String");
 	conv_utf_16_to_8(in16,out8, bsize);
 	return out8;
 }
 
-static wchar_t * BLI_alloc_utf16_from_8(char * in8, size_t add)
+static wchar_t *UNUSED_FUNCTION(BLI_alloc_utf16_from_8)(char *in8, size_t add)
 {
 	size_t bsize = count_utf_16_from_8(in8);
-	wchar_t * out16 = NULL;
+    wchar_t *out16 = NULL;
 	if (!bsize) return NULL;
 	out16 =(wchar_t*) MEM_mallocN(sizeof(wchar_t) * (bsize + add), "UTF-16 String");
 	conv_utf_8_to_16(in8,out16, bsize);
@@ -216,14 +217,15 @@
 
 
 
-struct dirent *readdir(DIR *dp) {
+struct dirent *readdir(DIR *dp)
+{
 	if (dp->direntry.d_name) {
 		MEM_freeN(dp->direntry.d_name);
 		dp->direntry.d_name= NULL;
 	}
 		
 	if (dp->handle==INVALID_HANDLE_VALUE) {
-		wchar_t * path_16 = alloc_utf16_from_8(dp->path, 0);
+        wchar_t *path_16 = alloc_utf16_from_8(dp->path, 0);
 		dp->handle= FindFirstFileW(path_16, &(dp->data));
 		free(path_16);
 		if (dp->handle==INVALID_HANDLE_VALUE)
@@ -253,7 +255,7 @@
 	return 0;
 }
 
-void get_default_root(char* root)
+void get_default_root(char *root)
 {
 	char str[MAX_PATH+1];
 	
@@ -333,7 +335,7 @@
  * is freely granted, provided that this notice is preserved.
  */
 #include <string.h>
-char* dirname(char *path)
+const char *dirname(char *path)
 {
 	char *p;
 	if ( path == NULL || *path == '\0' )