[iortcw] 283/497: All: Some random cleanup and merges in sys

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit d0c849b01b4415edefa7aa7dd27527365132768b
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed Jan 28 00:26:55 2015 +0000

    All: Some random cleanup and merges in sys
---
 MP/code/sys/sys_osx.m   | 14 --------------
 MP/code/sys/sys_unix.c  | 10 ++++++----
 MP/code/sys/sys_win32.c |  2 +-
 SP/code/sys/sys_unix.c  | 10 ++++++----
 SP/code/sys/sys_win32.c | 10 +---------
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/MP/code/sys/sys_osx.m b/MP/code/sys/sys_osx.m
index a5380d9..30bf932 100644
--- a/MP/code/sys/sys_osx.m
+++ b/MP/code/sys/sys_osx.m
@@ -115,17 +115,3 @@ char *Sys_StripAppBundle( char *dir )
 	Q_strncpyz(cwd, Sys_Dirname(cwd), sizeof(cwd));
 	return cwd;
 }
-
-/*
-==================
-Sys_StartProcess
-==================
-
-void Sys_StartProcess( char *exeName, qboolean doexit ) {
-	// FIXME TTimo
-	// this is only used for WolfSP / WolfMP spawning for now
-	if ( doexit ) {
-		exit( 0 );
-	}
-}
-*/
diff --git a/MP/code/sys/sys_unix.c b/MP/code/sys/sys_unix.c
index 757af77..714c591 100644
--- a/MP/code/sys/sys_unix.c
+++ b/MP/code/sys/sys_unix.c
@@ -513,14 +513,16 @@ void Sys_ErrorDialog( const char *error )
 #endif
 
 	// Make sure the write path for the crashlog exists...
-	if( !Sys_Mkdir( homepath ) )
+
+	if(!Sys_Mkdir(homepath))
 	{
-		Com_Printf( "ERROR: couldn't create path '%s' for crash log.\n", homepath );
+		Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", homepath);
+		return;
 	}
 
-	if( !Sys_Mkdir( dirpath ) )
+	if(!Sys_Mkdir(dirpath))
 	{
-		Com_Printf( "ERROR: couldn't create path '%s' for crash log.\n", dirpath );
+		Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", dirpath);
 		return;
 	}
 
diff --git a/MP/code/sys/sys_win32.c b/MP/code/sys/sys_win32.c
index 95b6287..e243754 100644
--- a/MP/code/sys/sys_win32.c
+++ b/MP/code/sys/sys_win32.c
@@ -89,7 +89,7 @@ char *Sys_DefaultHomePath( void )
 	TCHAR szPath[MAX_PATH];
 	FARPROC qSHGetFolderPath;
 	HMODULE shfolder = LoadLibrary("shfolder.dll");
-	
+
 	if(shfolder == NULL)
 	{
 		Com_Printf("Unable to load SHFolder.dll\n");
diff --git a/SP/code/sys/sys_unix.c b/SP/code/sys/sys_unix.c
index 65ce6aa..4bb0c0e 100644
--- a/SP/code/sys/sys_unix.c
+++ b/SP/code/sys/sys_unix.c
@@ -513,14 +513,16 @@ void Sys_ErrorDialog( const char *error )
 #endif
 
 	// Make sure the write path for the crashlog exists...
-	if( !Sys_Mkdir( homepath ) )
+
+	if(!Sys_Mkdir(homepath))
 	{
-		Com_Printf( "ERROR: couldn't create path '%s' for crash log.\n", homepath );
+		Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", homepath);
+		return;
 	}
 
-	if( !Sys_Mkdir( dirpath ) )
+	if(!Sys_Mkdir(dirpath))
 	{
-		Com_Printf( "ERROR: couldn't create path '%s' for crash log.\n", dirpath );
+		Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", dirpath);
 		return;
 	}
 
diff --git a/SP/code/sys/sys_win32.c b/SP/code/sys/sys_win32.c
index e0c4c4f..d466de4 100644
--- a/SP/code/sys/sys_win32.c
+++ b/SP/code/sys/sys_win32.c
@@ -95,15 +95,9 @@ char *Sys_DefaultHomePath( void )
 		Com_Printf("Unable to load SHFolder.dll\n");
 		return NULL;
 	}
-	
+
 	if(!*homePath && com_homepath)
 	{
-		if(shfolder == NULL)
-		{
-			Com_Printf("Unable to load SHFolder.dll\n");
-			return NULL;
-		}
-
 		qSHGetFolderPath = GetProcAddress(shfolder, "SHGetFolderPathA");
 		if(qSHGetFolderPath == NULL)
 		{
@@ -113,7 +107,6 @@ char *Sys_DefaultHomePath( void )
 		}
 
 		// Changed from CSIDL_APPDATA -> Stores in My Documents so it's more accessible
-
 		if( !SUCCEEDED( qSHGetFolderPath( NULL, CSIDL_PERSONAL,
 						NULL, 0, szPath ) ) )
 		{
@@ -128,7 +121,6 @@ char *Sys_DefaultHomePath( void )
 			Q_strcat(homePath, sizeof(homePath), com_homepath->string);
 		else
 			Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_WIN);
-
 	}
 
 	FreeLibrary(shfolder);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git