[Bf-blender-cvs] [7742a8f] master: Cleanup: reduce scope for win32, Linux vars

[Campbell Barton]

Commit: 7742a8f09c1a631adbbd87a407d55420f775fa4e
Author: Campbell Barton
Date:   Wed May 13 12:49:33 2015 +1000
Branches: master
https://developer.blender.org/rB7742a8f09c1a631adbbd87a407d55420f775fa4e

Cleanup: reduce scope for win32, Linux vars

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

M	source/blender/blenkernel/intern/appdir.c

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

diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 4c7cda9..e4ed8c3 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -514,31 +514,34 @@ const char *BKE_appdir_folder_id_version(const int folder_id, const int ver, con
  */
 static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name)
 {
-	const char *path = NULL;
-
 #ifdef WITH_BINRELOC
 	/* linux uses binreloc since argv[0] is not reliable, call br_init( NULL ) first */
-	path = br_find_exe(NULL);
-	if (path) {
-		BLI_strncpy(fullname, path, maxlen);
-		free((void *)path);
-		return;
+	{
+		const char *path = NULL;
+		path = br_find_exe(NULL);
+		if (path) {
+			BLI_strncpy(fullname, path, maxlen);
+			free((void *)path);
+			return;
+		}
 	}
 #endif
 
 #ifdef _WIN32
-	wchar_t *fullname_16 = MEM_mallocN(maxlen * sizeof(wchar_t), "ProgramPath");
-	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", (int)maxlen, fullname);
-			MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
+	{
+		wchar_t *fullname_16 = MEM_mallocN(maxlen * sizeof(wchar_t), "ProgramPath");
+		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", (int)maxlen, fullname);
+				MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
+			}
+			MEM_freeN(fullname_16);
+			return;
 		}
+
 		MEM_freeN(fullname_16);
-		return;
 	}
-
-	MEM_freeN(fullname_16);
 #endif
 
 	/* unix and non linux */