[70054] branches/gsoc10-gui/MacPorts_Framework
tzikis at macports.org
tzikis at macports.org
Wed Jul 28 11:34:37 PDT 2010
Revision: 70054
http://trac.macports.org/changeset/70054
Author: tzikis at macports.org
Date: 2010-07-28 11:34:36 -0700 (Wed, 28 Jul 2010)
Log Message:
-----------
Merged Juanger's changed
Modified Paths:
--------------
branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c
branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m
branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m
branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m
branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m
branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m
branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m
branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m
Property Changed:
----------------
branches/gsoc10-gui/MacPorts_Framework/
Property changes on: branches/gsoc10-gui/MacPorts_Framework
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc09-gui/MacPorts_Framework:50819-65490
+ /branches/gsoc09-gui/MacPorts_Framework:50819-65490
/contrib/MacPorts_Framework:69794-69795
Modified: branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c 2010-07-28 18:34:36 UTC (rev 70054)
@@ -1575,7 +1575,7 @@
// asl, aslMsg, and kq.
if (errStr != NULL) {
- err = asl_log(asl, aslMsg, ASL_LEVEL_ERR, errStr);
+ err = asl_log(asl, aslMsg, ASL_LEVEL_ERR, "%s", errStr);
assert(err == 0);
}
err = asl_log(asl, aslMsg, ASL_LEVEL_INFO, "Shutting down");
Modified: branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -346,8 +346,9 @@
return self;
}
-- (unsigned)retainCount {
- return UINT_MAX; //denotes an object that cannot be released
+- (NSUInteger)retainCount
+{
+ return NSUIntegerMax; //denotes an object that cannot be released
}
- (void)release {
@@ -544,7 +545,7 @@
//In order to make the framework work normally by default ... we do a bare initialization
- //of internalMacPortsAuthRef if the delegate hasn't iniitialzed it already
+ //of internalMacPortsAuthRef if the delegate hasn't initialzed it already
if (internalMacPortsAuthRef == NULL) {
OSStatus res = AuthorizationCreate (NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &internalMacPortsAuthRef);
assert(res == noErr);
Modified: branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -115,8 +115,9 @@
return self;
}
-- (unsigned)retainCount {
- return UINT_MAX; //denotes an object that cannot be released
+- (NSUInteger)retainCount
+{
+ return NSUIntegerMax; //denotes an object that cannot be released
}
- (void)release {
Modified: branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -41,7 +41,7 @@
- (id)init {
self = [super init];
if (self != nil) {
- embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:0];
+ embeddedDictionary = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:0];
}
return self;
}
@@ -49,7 +49,7 @@
- (id)initWithCapacity:(unsigned)numItems {
self = [super init];
if (self != nil) {
- embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:numItems];
+ embeddedDictionary = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:numItems];
}
return self;
}
Modified: branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -795,7 +795,7 @@
result = ClientCheckPacketSize(client, &packet->fHeader, sizeof(PacketShout));
if (result) {
result = ClientCheckPacketID(client, &packet->fHeader, kPacketIDNone);
- NSLog(@"Packetsize is OK");
+ //NSLog(@"Packetsize is OK");
}
else
NSLog(@"Packetsize is NOT OK");
@@ -803,7 +803,7 @@
// The Shout packet is good. Let's echo it to each listener.
if (result) {
- NSLog(@"PacketID is ok");
+ //NSLog(@"PacketID is ok");
ClientState ** allClients;
Modified: branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -69,8 +69,8 @@
return self;
}
-- (unsigned)retainCount {
- return UINT_MAX;
+- (NSUInteger)retainCount {
+ return NSUIntegerMax; //denotes an object that cannot be released
}
-(void) release {
Modified: branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -72,8 +72,8 @@
return self;
}
-- (unsigned)retainCount {
- return UINT_MAX; //denotes an object that cannot be released
+- (NSUInteger)retainCount {
+ return NSUIntegerMax; //denotes an object that cannot be released
}
- (void)release {
@@ -100,7 +100,7 @@
NSArray *versions;
id item;
raw = [self installedAsArray:name withVersion:version];
- result = [[NSMutableDictionary alloc] initWithCapacity:[raw count]];
+ result = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:[raw count]];
rawEnumerator = [raw objectEnumerator];
while (item = [rawEnumerator nextObject]) {
versions = [interpreter arrayFromTclListAsString:item];
Modified: branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m 2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m 2010-07-28 18:34:36 UTC (rev 70054)
@@ -26,12 +26,12 @@
if (tclResult == TCL_OK) {
if (tclCount > 0) {
- NSLog([NSString stringWithUTF8String:tclElements[0]]);
+ NSLog(@"%@", [NSString stringWithUTF8String:tclElements[0]]);
data = [NSMutableString stringWithUTF8String:tclElements[0]];
[data appendString:MPSEPARATOR];
if(tclCount > 1 && tclElements[1]) {
- NSLog([NSString stringWithUTF8String:tclElements[1]]);
+ NSLog(@"%@", [NSString stringWithUTF8String:tclElements[1]]);
[data appendString:[NSString stringWithUTF8String:tclElements[1]]];
[data appendString:MPSEPARATOR];
}
@@ -41,7 +41,7 @@
}
if(tclCount > 2 && tclElements[2]) {
- NSLog([NSString stringWithUTF8String:tclElements[2]]);
+ NSLog(@"%@", [NSString stringWithUTF8String:tclElements[2]]);
[data appendString:[NSString stringWithUTF8String:tclElements[2]]];
[data appendString:MPSEPARATOR];
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100728/89fe54cf/attachment.html>
More information about the macports-changes
mailing list