[61180] users/toby/objcports/internal.c

[toby at macports.org]

Revision: 61180
          http://trac.macports.org/changeset/61180
Author:   toby at macports.org
Date:     2009-12-03 23:57:35 -0800 (Thu, 03 Dec 2009)
Log Message:
-----------
misc

Modified Paths:
--------------
    users/toby/objcports/internal.c

Modified: users/toby/objcports/internal.c
===================================================================
--- users/toby/objcports/internal.c	2009-12-04 07:54:03 UTC (rev 61179)
+++ users/toby/objcports/internal.c	2009-12-04 07:57:35 UTC (rev 61180)
@@ -6,12 +6,11 @@
 char *
 strdup_cf(CFStringRef str)
 {
-	CFIndex length, size;
+	CFIndex size;
 	char *result;
 
-	length = CFStringGetLength(str);
-	size = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8) + 1;
-	result = calloc(size, sizeof(char));
+	size = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str), kCFStringEncodingUTF8) + 1;
+	result = malloc(size);
 	if (result) {
 		if (!CFStringGetCString(str, result, size, kCFStringEncodingUTF8)) {
 			free(result);
@@ -30,7 +29,7 @@
 	int rc;
 
 	formatstr = CFStringCreateWithCString(NULL, format, kCFStringEncodingUTF8);
-	
+
 	va_start(ap, format);
 	str = CFStringCreateWithFormatAndArguments(NULL, NULL, formatstr, ap);
 	va_end(ap);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091203/59b87624/attachment-0001.html>