Issue #18377: Code cleanup in Python Launcher
This changeset fixes a number of compiler warnings in the Python Launcher
binary for OSX. It also cleans up whitespace usage in those sources.
diff --git a/Mac/PythonLauncher/doscript.m b/Mac/PythonLauncher/doscript.m
index 024b883..cbb783b 100644
--- a/Mac/PythonLauncher/doscript.m
+++ b/Mac/PythonLauncher/doscript.m
@@ -11,49 +11,49 @@
#import <ApplicationServices/ApplicationServices.h>
#import "doscript.h"
-extern int
+extern int
doscript(const char *command)
{
- char *bundleID = "com.apple.Terminal";
- AppleEvent evt, res;
- AEDesc desc;
- OSStatus err;
+ char *bundleID = "com.apple.Terminal";
+ AppleEvent evt, res;
+ AEDesc desc;
+ OSStatus err;
- [[NSWorkspace sharedWorkspace] launchApplication:@"/Applications/Utilities/Terminal.app/"];
+ [[NSWorkspace sharedWorkspace] launchApplication:@"/Applications/Utilities/Terminal.app/"];
- // Build event
- err = AEBuildAppleEvent(kAECoreSuite, kAEDoScript,
- typeApplicationBundleID,
- bundleID, strlen(bundleID),
- kAutoGenerateReturnID,
- kAnyTransactionID,
- &evt, NULL,
- "'----':utf8(@)", strlen(command),
- command);
- if (err) {
- NSLog(@"AEBuildAppleEvent failed: %d\n", err);
- return err;
- }
+ // Build event
+ err = AEBuildAppleEvent(kAECoreSuite, kAEDoScript,
+ typeApplicationBundleID,
+ bundleID, strlen(bundleID),
+ kAutoGenerateReturnID,
+ kAnyTransactionID,
+ &evt, NULL,
+ "'----':utf8(@)", strlen(command),
+ command);
+ if (err) {
+ NSLog(@"AEBuildAppleEvent failed: %ld\n", (long)err);
+ return err;
+ }
- // Send event and check for any Apple Event Manager errors
- err = AESendMessage(&evt, &res, kAEWaitReply, kAEDefaultTimeout);
- AEDisposeDesc(&evt);
- if (err) {
- NSLog(@"AESendMessage failed: %d\n", err);
- return err;
- }
- // Check for any application errors
- err = AEGetParamDesc(&res, keyErrorNumber, typeSInt32, &desc);
- AEDisposeDesc(&res);
- if (!err) {
- AEGetDescData(&desc, &err, sizeof(err));
- NSLog(@"Terminal returned an error: %d", err);
- AEDisposeDesc(&desc);
- } else if (err == errAEDescNotFound) {
- err = noErr;
- } else {
- NSLog(@"AEGetPArmDesc returned an error: %d", err);
- }
+ // Send event and check for any Apple Event Manager errors
+ err = AESendMessage(&evt, &res, kAEWaitReply, kAEDefaultTimeout);
+ AEDisposeDesc(&evt);
+ if (err) {
+ NSLog(@"AESendMessage failed: %ld\n", (long)err);
+ return err;
+ }
+ // Check for any application errors
+ err = AEGetParamDesc(&res, keyErrorNumber, typeSInt32, &desc);
+ AEDisposeDesc(&res);
+ if (!err) {
+ AEGetDescData(&desc, &err, sizeof(err));
+ NSLog(@"Terminal returned an error: %ld", (long)err);
+ AEDisposeDesc(&desc);
+ } else if (err == errAEDescNotFound) {
+ err = noErr;
+ } else {
+ NSLog(@"AEGetPArmDesc returned an error: %ld", (long)err);
+ }
- return err;
+ return err;
}