[Pgsqlformac-commits] SF.net SVN: pgsqlformac:[196] trunk/PGSQLKit/PGSQLField.m

[<dav...@us...>]

Revision: 196
          http://pgsqlformac.svn.sourceforge.net/pgsqlformac/?rev=196&view=rev
Author:   davydgeyl
Date:     2008-09-03 23:12:38 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
asString method changed to return correct string without null character, autoreleased

Modified Paths:
--------------
    trunk/PGSQLKit/PGSQLField.m

Modified: trunk/PGSQLKit/PGSQLField.m
===================================================================
--- trunk/PGSQLKit/PGSQLField.m	2008-06-05 15:41:23 UTC (rev 195)
+++ trunk/PGSQLKit/PGSQLField.m	2008-09-03 23:12:38 UTC (rev 196)
@@ -40,17 +40,24 @@
 
 -(NSString *)asString
 {	
-	if (data != nil) {
-		if ([data length] <= 0)
+	NSString* result = @"";
+	if (data != nil)
+	{
+		int dataLength = [data length];
+		if (dataLength > 0)
 		{
-			return nil;
+			// check for null terminator
+			char* ptr = (char*)[data bytes];
+			char lastChar = ptr[dataLength];
+			if (lastChar == '\0')
+				dataLength--;
+			if (dataLength > 0)
+				result = [[[NSString alloc] initWithBytes:[data bytes] length:dataLength encoding:NSMacOSRomanStringEncoding] autorelease];
 		}
-		return [[NSString alloc] initWithBytes:[data bytes] length:[data length] encoding:NSMacOSRomanStringEncoding];	
 	}
-	return @""; 
+	return result; 
 }
 
-
 -(NSNumber *)asNumber
 {
 	if (data != nil) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.