From 877d8909d9389ccd42e2693e4f824fe6efbf156b Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 11 May 2006 03:08:39 +0000 Subject: [PATCH] Date: Wed, 10 May 2006 17:43:21 -0700 From: Eric Wing Subject: Re: Updated tarball Attached are additional cleanups to SDLMain.m for the files in src/ main/macosx. It looks like somebody already cleaned up most of the issues. There is one about the class interfaces being empty which didn't look easy to fix in a meaningful way so I left them. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401769 --- src/main/macosx/SDLMain.m | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/macosx/SDLMain.m b/src/main/macosx/SDLMain.m index fd5196278..2eaa1c11e 100644 --- a/src/main/macosx/SDLMain.m +++ b/src/main/macosx/SDLMain.m @@ -252,19 +252,24 @@ static void CustomApplicationMain (int argc, char **argv) */ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename { + const char *temparg; + size_t arglen; + char *arg; + char **newargv; + if (!gFinderLaunch) /* MacOS is passing command line args. */ return FALSE; if (gCalledAppMainline) /* app has started, ignore this document. */ return FALSE; - const char *temparg = [filename UTF8String]; - size_t arglen = SDL_strlen(temparg) + 1; - char *arg = (char *) SDL_malloc(arglen); + temparg = [filename UTF8String]; + arglen = SDL_strlen(temparg) + 1; + arg = (char *) SDL_malloc(arglen); if (arg == NULL) return FALSE; - char **newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2)); + newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2)); if (newargv == NULL) { SDL_free(arg); @@ -376,3 +381,4 @@ int main (int argc, char **argv) #endif return 0; } +