Mercurial > cpython-lru_cache-weakref

comparison Mac/PythonLauncher/doscript.m @ 84479:738cba2bf849 3.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ronald Oussoren <ronaldoussoren@mac.com>
date Sun, 07 Jul 2013 09:53:08 +0200
parents 031dfe455585
children
comparison
equal deleted inserted replaced
84476:f4747e1ce2b1 84479:738cba2bf849
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
11 #import <ApplicationServices/ApplicationServices.h> 11 #import <ApplicationServices/ApplicationServices.h>
12 #import "doscript.h" 12 #import "doscript.h"
13 13
14 extern int 14 extern int
15 doscript(const char *command) 15 doscript(const char *command)
16 { 16 {
17 char *bundleID = "com.apple.Terminal"; 17 char *bundleID = "com.apple.Terminal";
18 AppleEvent evt, res; 18 AppleEvent evt, res;
19 AEDesc desc; 19 AEDesc desc;
20 OSStatus err; 20 OSStatus err;
21 21
22 [[NSWorkspace sharedWorkspace] launchApplication:@"/Applications/Utilities/Terminal.app/"]; 22 [[NSWorkspace sharedWorkspace] launchApplication:@"/Applications/Utilities/Terminal.app/"];
23 23
24 // Build event 24 // Build event
25 err = AEBuildAppleEvent(kAECoreSuite, kAEDoScript, 25 err = AEBuildAppleEvent(kAECoreSuite, kAEDoScript,
26 typeApplicationBundleID, 26 typeApplicationBundleID,
27 bundleID, strlen(bundleID), 27 bundleID, strlen(bundleID),
28 kAutoGenerateReturnID, 28 kAutoGenerateReturnID,
29 kAnyTransactionID, 29 kAnyTransactionID,
30 &evt, NULL, 30 &evt, NULL,
31 "'----':utf8(@)", strlen(command), 31 "'----':utf8(@)", strlen(command),
32 command); 32 command);
33 if (err) { 33 if (err) {
34 NSLog(@"AEBuildAppleEvent failed: %d\n", err); 34 NSLog(@"AEBuildAppleEvent failed: %ld\n", (long)err);
35 return err; 35 return err;
36 } 36 }
37 37
38 // Send event and check for any Apple Event Manager errors 38 // Send event and check for any Apple Event Manager errors
39 err = AESendMessage(&evt, &res, kAEWaitReply, kAEDefaultTimeout); 39 err = AESendMessage(&evt, &res, kAEWaitReply, kAEDefaultTimeout);
40 AEDisposeDesc(&evt); 40 AEDisposeDesc(&evt);
41 if (err) { 41 if (err) {
42 NSLog(@"AESendMessage failed: %d\n", err); 42 NSLog(@"AESendMessage failed: %ld\n", (long)err);
43 return err; 43 return err;
44 } 44 }
45 // Check for any application errors 45 // Check for any application errors
46 err = AEGetParamDesc(&res, keyErrorNumber, typeSInt32, &desc); 46 err = AEGetParamDesc(&res, keyErrorNumber, typeSInt32, &desc);
47 AEDisposeDesc(&res); 47 AEDisposeDesc(&res);
48 if (!err) { 48 if (!err) {
49 AEGetDescData(&desc, &err, sizeof(err)); 49 AEGetDescData(&desc, &err, sizeof(err));
50 NSLog(@"Terminal returned an error: %d", err); 50 NSLog(@"Terminal returned an error: %ld", (long)err);
51 AEDisposeDesc(&desc); 51 AEDisposeDesc(&desc);
52 } else if (err == errAEDescNotFound) { 52 } else if (err == errAEDescNotFound) {
53 err = noErr; 53 err = noErr;
54 } else { 54 } else {
55 NSLog(@"AEGetPArmDesc returned an error: %d", err); 55 NSLog(@"AEGetPArmDesc returned an error: %ld", (long)err);
56 } 56 }
57 57
58 return err; 58 return err;
59 } 59 }