[58705] users/toby/objcports

toby at macports.org toby at macports.org
Fri Oct 2 21:29:46 PDT 2009


Revision: 58705
          http://trac.macports.org/changeset/58705
Author:   toby at macports.org
Date:     2009-10-02 21:29:45 -0700 (Fri, 02 Oct 2009)
Log Message:
-----------
fixes

Modified Paths:
--------------
    users/toby/objcports/MPIndex.c
    users/toby/objcports/MPPort.c
    users/toby/objcports/cftcl.c
    users/toby/objcports/internal.c
    users/toby/objcports/internal.h
    users/toby/objcports/port.c

Modified: users/toby/objcports/MPIndex.c
===================================================================
--- users/toby/objcports/MPIndex.c	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/MPIndex.c	2009-10-03 04:29:45 UTC (rev 58705)
@@ -50,7 +50,7 @@
 		Tcl_ReadChars(chan, line, len, 0);
 		Tcl_ListObjGetElements(interp, line, &objc, &objv);
 		value = CFDictionaryCreateWithTclObjects(NULL, objv, objc);
-		assert(value != nil);
+		assert(value);
 
 		/* Store data. */
 		CFDictionarySetValue(result, key, value);

Modified: users/toby/objcports/MPPort.c
===================================================================
--- users/toby/objcports/MPPort.c	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/MPPort.c	2009-10-03 04:29:45 UTC (rev 58705)
@@ -282,7 +282,7 @@
 		free(s);
 		CFRelease(ret);
 	} else {
-		fprintf_cf(stderr, CFSTR("WARNING: unknown variable %@\n"), name);
+		fprintf_cf(stderr, "WARNING: unknown variable %@\n", name);
 	}
 	return subst;
 }
@@ -527,7 +527,7 @@
 		assert(count == 2);
 		assert(CFStringCompare(CFArrayGetValueAtIndex(args, 1), CFSTR("1.0"), 0) == kCFCompareEqualTo);
 	} else if (CFStringCompare(command, CFSTR("PortGroup"), 0) == kCFCompareEqualTo) {
-		fprintf_cf(stderr, CFSTR("ignoring %@, grps r hard m'kay\n"), command);
+		fprintf_cf(stderr, "ignoring %@, grps r hard m'kay\n", command);
 		// XXX: this should probably set some state in parent port instance
 		// (ugh, more tcl parsing)
 	} else if (CFStringCompare(command, CFSTR("platform"), 0) == kCFCompareEqualTo) {
@@ -660,7 +660,7 @@
 	var = mp_port_variable(clientData, tmp);
 	CFRelease(tmp);
 
-	assert(var != nil);
+	assert(var);
 
 	s = strdup_cf(var);
 	Tcl_SetVar2(interp, name1, name2, s, 0);

Modified: users/toby/objcports/cftcl.c
===================================================================
--- users/toby/objcports/cftcl.c	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/cftcl.c	2009-10-03 04:29:45 UTC (rev 58705)
@@ -33,7 +33,7 @@
 	CFDictionaryRef result;
 	
 	if ((count % 2) != 0) {
-		return nil;
+		return NULL;
 	}
 	
 	count2 = count / 2;

Modified: users/toby/objcports/internal.c
===================================================================
--- users/toby/objcports/internal.c	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/internal.c	2009-10-03 04:29:45 UTC (rev 58705)
@@ -22,15 +22,17 @@
 }
 
 int
-fprintf_cf(FILE *stream, CFStringRef format, ...)
+fprintf_cf(FILE *stream, const char *format, ...)
 {
 	va_list ap;
-	CFStringRef str;
+	CFStringRef formatstr, str;
 	char *s;
 	int rc;
 
+	formatstr = CFStringCreateWithCString(NULL, format, kCFStringEncodingUTF8);
+	
 	va_start(ap, format);
-	str = CFStringCreateWithFormatAndArguments(NULL, NULL, format, ap);
+	str = CFStringCreateWithFormatAndArguments(NULL, NULL, formatstr, ap);
 	va_end(ap);
 
 	s = strdup_cf(str);
@@ -38,6 +40,7 @@
 	free(s);
 
 	CFRelease(str);
+	CFRelease(formatstr);
 
 	return rc;
 }

Modified: users/toby/objcports/internal.h
===================================================================
--- users/toby/objcports/internal.h	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/internal.h	2009-10-03 04:29:45 UTC (rev 58705)
@@ -1,5 +1,5 @@
 char *strdup_cf(CFStringRef str);
-int fprintf_cf(FILE *stream, CFStringRef format, ...);
+int fprintf_cf(FILE *stream, const char *format, ...);
 
 typedef void (^CFArrayApplierBlock)(const void *);
 typedef void (^CFDictionaryApplierBlock)(const void *, const void *);

Modified: users/toby/objcports/port.c
===================================================================
--- users/toby/objcports/port.c	2009-10-03 04:20:28 UTC (rev 58704)
+++ users/toby/objcports/port.c	2009-10-03 04:29:45 UTC (rev 58705)
@@ -3,6 +3,7 @@
 #include "MPConfig.h"
 #include "MPIndex.h"
 #include "MPPort.h"
+#include "internal.h"
 
 static void
 do_showconfig()
@@ -21,10 +22,14 @@
 	CFDictionaryRef index;
 
 	filename = CFStringCreateWithCString(NULL, f, kCFStringEncodingUTF8);
-	index = MPCopyPortIndex(filename);
-	CFShow(index);
-	CFRelease(index);
-	CFRelease(filename);
+	if (filename) {
+		index = MPCopyPortIndex(filename);
+		CFRelease(filename);
+		if (index) {
+			CFShow(index);
+			CFRelease(index);
+		}
+	}
 }
 
 static void
@@ -45,49 +50,49 @@
 		tmp1 = mp_port_variable(port, CFSTR("name"));
 		tmp2 = mp_port_variable(port, CFSTR("version"));
 		tmp3 = mp_port_variable(port, CFSTR("categories"));
-		fprintf_cf(stdout, CFSTR("%@ @%@ (%@)\n"), tmp1, tmp2, tmp3);
+		fprintf_cf(stdout, "%@ @%@ (%@)\n", tmp1, tmp2, tmp3);
 		CFRelease(tmp1); CFRelease(tmp2); CFRelease(tmp3);
 
 		tmp1 = mp_port_defined_variants(port);
 		tmp2 = CFStringCreateByCombiningStrings(NULL, tmp1, CFSTR(", "));
-		fprintf_cf(stdout, CFSTR("Variants:             %@\n"), tmp2);
+		fprintf_cf(stdout, "Variants:             %@\n", tmp2);
 		CFRelease(tmp1); CFRelease(tmp2);
 
 		tmp1 = mp_port_defined_platforms(port);
 		tmp2 = CFStringCreateByCombiningStrings(NULL, tmp1, CFSTR(", "));
-		fprintf_cf(stdout, CFSTR("PlatformVariants:     %@\n"), tmp2);
+		fprintf_cf(stdout, "PlatformVariants:     %@\n", tmp2);
 		CFRelease(tmp1); CFRelease(tmp2);
 
-		fprintf_cf(stdout, CFSTR("\n"));
+		fprintf_cf(stdout, "\n");
 
 		tmp1 = mp_port_variable(port, CFSTR("long_description"));
-		fprintf_cf(stdout, CFSTR("Description:          %@\n"), tmp1);
+		fprintf_cf(stdout, "Description:          %@\n", tmp1);
 		CFRelease(tmp1);
 		
 		tmp1 = mp_port_variable(port, CFSTR("homepage"));
-		fprintf_cf(stdout, CFSTR("Homepage:             %@\n"), tmp1);
+		fprintf_cf(stdout, "Homepage:             %@\n", tmp1);
 		CFRelease(tmp1);
 		
-		fprintf_cf(stdout, CFSTR("\n"));
+		fprintf_cf(stdout, "\n");
 
 		tmp1 = mp_port_variable(port, CFSTR("depends_build"));
-		fprintf_cf(stdout, CFSTR("Build Dependencies:   %@\n"), tmp1);
+		fprintf_cf(stdout, "Build Dependencies:   %@\n", tmp1);
 		CFRelease(tmp1);
 		
 		tmp1 = mp_port_variable(port, CFSTR("depends_lib"));
-		fprintf_cf(stdout, CFSTR("Library Dependencies: %@\n"), tmp1);
+		fprintf_cf(stdout, "Library Dependencies: %@\n", tmp1);
 		CFRelease(tmp1);
 		
 		tmp1 = mp_port_variable(port, CFSTR("platforms"));
-		fprintf_cf(stdout, CFSTR("Platforms:            %@\n"), tmp1);
+		fprintf_cf(stdout, "Platforms:            %@\n", tmp1);
 		CFRelease(tmp1);
 
 		tmp1 = mp_port_variable(port, CFSTR("license"));
-		fprintf_cf(stdout, CFSTR("License:              %@\n"), tmp1);
+		fprintf_cf(stdout, "License:              %@\n", tmp1);
 		CFRelease(tmp1);
 
 		tmp1 = mp_port_variable(port, CFSTR("maintainers"));
-		fprintf_cf(stdout, CFSTR("Maintainers:          %@\n"), tmp1);
+		fprintf_cf(stdout, "Maintainers:          %@\n", tmp1);
 		CFRelease(tmp1);
 
 		mp_port_destroy(port);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091002/b44440bf/attachment-0001.html>


More information about the macports-changes mailing list