replaced ASCII Encoding with UTF8 encoding on all string transformations

MoSync · Feb 13, 2013 · 72fccab · 72fccab
1 parent 5a271e6
commit 72fccab
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 42 deletions.
diff --git a/intlibs/bluetooth/darwin/interface.mm b/intlibs/bluetooth/darwin/interface.mm
@@ -198,7 +198,7 @@ int maBtGetNewDevice ( MABtDeviceNative* d )
 			NSString* deviceNameString	= [dev getNameOrAddress];
 			d->actualNameLength=deviceNameString.length;
 			const char *cstr = new char[deviceNameString.length+1];
-			cstr = [deviceNameString cStringUsingEncoding:NSASCIIStringEncoding];
+			cstr = [deviceNameString cStringUsingEncoding:NSUTF8StringEncoding];
 			if (cstr == NULL) cstr = "NO NAME";
 			strcpy(d->name, cstr);
 		}
@@ -259,7 +259,7 @@ int maBtGetNewService ( MABtServiceNative* d )
 		// Fill the name field of the NABtDevice structure
 		NSString *serviceName = [record getServiceName];
 		const char *cstr = new char[serviceName.length+1];
-		cstr = [serviceName cStringUsingEncoding:NSASCIIStringEncoding];
+		cstr = [serviceName cStringUsingEncoding:NSUTF8StringEncoding];
 		if (cstr == NULL) cstr = "NO NAME";
 		strcpy(d->name, cstr);
 

diff --git a/runtimes/cpp/platforms/iphone/Classes/Expanded/NSDataExpanded.mm b/runtimes/cpp/platforms/iphone/Classes/Expanded/NSDataExpanded.mm
@@ -56,7 +56,7 @@ - (NSString*)base64Encode
         output[index + 3] = (i + 2) < length ? table[(value >> 0) & 0x3f] : '=';
     }
 
-    return [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autorelease];
+    return [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
 }
 
 @end
diff --git a/runtimes/cpp/platforms/iphone/Classes/NativeUI/Syscalls/MoSyncUISyscalls.mm b/runtimes/cpp/platforms/iphone/Classes/NativeUI/Syscalls/MoSyncUISyscalls.mm
@@ -461,7 +461,7 @@ int maWidgetGetProperty(MAWidgetHandle handle, const char *property, char *value
 		return MAW_RES_INVALID_STRING_BUFFER_SIZE;
 	}
 
-	[retval getCString:value maxLength:length encoding:NSASCIIStringEncoding];
+	[retval getCString:value maxLength:length encoding:NSUTF8StringEncoding];
 	[retval release];
     [propertyString release];
 

diff --git a/runtimes/cpp/platforms/iphone/Classes/NativeUI/Widgets/WebViewWidget.mm b/runtimes/cpp/platforms/iphone/Classes/NativeUI/Widgets/WebViewWidget.mm
@@ -82,8 +82,8 @@ - (int)setPropertyWithKey: (NSString*)key toValue: (NSString*)value {
 			  url = [[NSURL URLWithString: webURLString] filePathURL];
 		  } else {
               // Convert the string URL into ascii encoding.
-              NSData* data = [value dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
-              NSString* formattedURL = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+              NSData* data = [value dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
+              NSString* formattedURL = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
               url = [NSURL URLWithString:formattedURL];
               [formattedURL release];
 		  }
@@ -339,11 +339,11 @@ - (BOOL)webView:(UIWebView *)webView
 
         //We create a placeholder resource that holds the url string
         MAHandle urlHandle = (MAHandle) Base::gSyscall->resources.create_RT_PLACEHOLDER();
-        int size = (int)[url lengthOfBytesUsingEncoding:NSASCIIStringEncoding];
+        int size = (int)[url lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
         Base::MemStream* ms = new Base::MemStream(size);
         Base::gSyscall->resources.add_RT_BINARY(urlHandle, ms);
         ms->seek(Base::Seek::Start, 0);
-        ms->write([url cStringUsingEncoding:NSASCIIStringEncoding], size);
+        ms->write([url cStringUsingEncoding:NSUTF8StringEncoding], size);
 
         eventData->urlData = urlHandle;
         event.data = (MAAddress)eventData;

diff --git a/runtimes/cpp/platforms/iphone/Classes/ads/Ads.mm b/runtimes/cpp/platforms/iphone/Classes/ads/Ads.mm
@@ -323,7 +323,7 @@ -(int) bannerGetProperty:(MAHandle) bannerHandle
 		return MA_ADS_RES_INVALID_STRING_BUFFER_SIZE;
 	}
 
-	[retval getCString:value maxLength:length encoding:NSASCIIStringEncoding];
+	[retval getCString:value maxLength:length encoding:NSUTF8StringEncoding];
 	[retval release];
 
 	return realLength;

diff --git a/runtimes/cpp/platforms/iphone/Classes/audio/AudioSyscall.mm b/runtimes/cpp/platforms/iphone/Classes/audio/AudioSyscall.mm
@@ -64,7 +64,7 @@ MAAudioData maAudioDataCreateFromResource(const char* mime, MAHandle data, int o
 {
     NSString* mimeType = @"";
     if(mime != NULL)
-        mimeType = [[NSString alloc] initWithCString:mime encoding:NSASCIIStringEncoding];
+        mimeType = [[NSString alloc] initWithCString:mime encoding:NSUTF8StringEncoding];
 
     int error;
     AudioData* audioData = [[AudioData alloc] initWithMime:mimeType audio:data offset:offset length:length andFlags:flags error:&error];
@@ -80,10 +80,10 @@ MAAudioData maAudioDataCreateFromURL(const char* mime, const char* path, int fla
 {
     NSString* mimeType = @"";
     if(mime != NULL)
-        mimeType = [[NSString alloc] initWithCString:mime encoding:NSASCIIStringEncoding];
+        mimeType = [[NSString alloc] initWithCString:mime encoding:NSUTF8StringEncoding];
 
     if(path == NULL) return MA_AUDIO_ERR_INVALID_FILENAME;
-    NSString* filename = [[NSString alloc] initWithCString:path encoding:NSASCIIStringEncoding];
+    NSString* filename = [[NSString alloc] initWithCString:path encoding:NSUTF8StringEncoding];
 
     int error;
     AudioData* audioData = [[AudioData alloc] initWithMime:mimeType filename:filename andFlags:flags error:&error];

diff --git a/runtimes/cpp/platforms/iphone/Classes/capture/Capture.mm b/runtimes/cpp/platforms/iphone/Classes/capture/Capture.mm
@@ -262,7 +262,7 @@ -(int) getProperty:(const char*) property
         }
         else
         {
-            [valueString getCString:value maxLength:bufSize encoding:NSASCIIStringEncoding];
+            [valueString getCString:value maxLength:bufSize encoding:NSUTF8StringEncoding];
         }
     }
 
@@ -370,7 +370,7 @@ -(int) getVideoPath:(MAHandle) handle
         }
         else
         {
-            [path getCString:buffer maxLength:maxSize encoding:NSASCIIStringEncoding];
+            [path getCString:buffer maxLength:maxSize encoding:NSUTF8StringEncoding];
         }
     }
     else

diff --git a/runtimes/cpp/platforms/iphone/Classes/impl/SyscallImpl.mm b/runtimes/cpp/platforms/iphone/Classes/impl/SyscallImpl.mm
@@ -777,16 +777,16 @@ MAHandle createFontInfo(CFStringRef name, GLfloat size, UIFont *uiFontObject, CG
         //buffer must be large enough to hold the string
         //lenghtOfBytes does not include terminating '\0',
         //That's why we use less or equal
-        if(!fontName || bufferLength<=[fontName lengthOfBytesUsingEncoding:NSASCIIStringEncoding])
+        if(!fontName || bufferLength<=[fontName lengthOfBytesUsingEncoding:NSUTF8StringEncoding])
         {
             return RES_FONT_INSUFFICIENT_BUFFER;
         }
 
         //strncpy will also fill the rest of the buffer with '\0' characters
-        strncpy(buffer, [fontName cStringUsingEncoding:NSASCIIStringEncoding], bufferLength);
+        strncpy(buffer, [fontName cStringUsingEncoding:NSUTF8StringEncoding], bufferLength);
 
         //Increase by one for the terminating '\0'
-        return [fontName lengthOfBytesUsingEncoding:NSASCIIStringEncoding]+1;
+        return [fontName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]+1;
     }
 
 
@@ -1210,7 +1210,7 @@ void flipColorsFromAxGyToAyGx(int *buf, int width, int height, int scanlength) {
 
     SYSCALL(int, maFileSetProperty(const char* path, int property, int value))
     {
-        NSURL *url = [NSURL fileURLWithPath:[NSString stringWithCString:path encoding:NSASCIIStringEncoding] isDirectory:NO];
+        NSURL *url = [NSURL fileURLWithPath:[NSString stringWithCString:path encoding:NSUTF8StringEncoding] isDirectory:NO];
         if(!url || ![[NSFileManager defaultManager] fileExistsAtPath:[url path]])
         {
             return MA_FERR_NOTFOUND;
@@ -1332,8 +1332,8 @@ void flipColorsFromAxGyToAyGx(int *buf, int width, int height, int scanlength) {
 
 		MFMessageComposeViewController *smsController = [[MFMessageComposeViewController alloc] init];
 
-		smsController.recipients = [NSArray arrayWithObject:[NSString stringWithCString:dst encoding:NSASCIIStringEncoding]];
-		smsController.body = [NSString stringWithCString:msg encoding:NSASCIIStringEncoding];
+		smsController.recipients = [NSArray arrayWithObject:[NSString stringWithCString:dst encoding:NSUTF8StringEncoding]];
+		smsController.body = [NSString stringWithCString:msg encoding:NSUTF8StringEncoding];
 
 		smsController.messageComposeDelegate = [[SMSResultDelegate alloc] init];
 
@@ -1442,30 +1442,30 @@ int maGetSystemProperty(const char *key, char *buf, int size) {
 		} else if (strcmp(key, "mosync.path.local") == 0) {
 			NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 			NSString *documentsDirectoryPath = [NSString stringWithFormat:@"%@/",[paths objectAtIndex:0]];
-			BOOL success = [documentsDirectoryPath getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [documentsDirectoryPath getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.path.local.urlPrefix") == 0) {
-			BOOL success = [@"file://localhost/" getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [@"file://localhost/" getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.device.name") == 0) {
-			BOOL success = [[[UIDevice currentDevice] name] getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [[[UIDevice currentDevice] name] getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.device.UUID")== 0) {
-			BOOL success = [[[UIDevice currentDevice] uniqueIdentifier] getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [[[UIDevice currentDevice] uniqueIdentifier] getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.device.OS")== 0) {
-			BOOL success = [[[UIDevice currentDevice] systemName] getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [[[UIDevice currentDevice] systemName] getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.device.OS.version") == 0) {
-			BOOL success = [[[UIDevice currentDevice] systemVersion] getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [[[UIDevice currentDevice] systemVersion] getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.device") == 0) {
 			size_t responseSz;
 			sysctlbyname("hw.machine", NULL, &responseSz, NULL, 0);
 			char *machine = (char*)malloc(responseSz);
 			sysctlbyname("hw.machine", machine, &responseSz, NULL, 0);
-			NSString *platform = [NSString stringWithCString:machine encoding:NSASCIIStringEncoding];
-			BOOL success = [platform getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			NSString *platform = [NSString stringWithCString:machine encoding:NSUTF8StringEncoding];
+			BOOL success = [platform getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			free(machine);
 			res = (success)?strlen(buf) + 1: -1;
 		} else if (strcmp(key, "mosync.network.type") == 0) {
@@ -1489,7 +1489,7 @@ int maGetSystemProperty(const char *key, char *buf, int size) {
 					networkType = @"unknown";
 					break;
 			}
-			BOOL success = [networkType getCString:buf maxLength:size encoding:NSASCIIStringEncoding];
+			BOOL success = [networkType getCString:buf maxLength:size encoding:NSUTF8StringEncoding];
 			res = (success)?strlen(buf) + 1: -1;
 		}
 
@@ -2021,7 +2021,7 @@ void StopAllCameraSessions()
 				return -2;
 			}
 
-			[retval getCString:value maxLength:length encoding:NSASCIIStringEncoding]; //stores the cstring value of retval in value
+			[retval getCString:value maxLength:length encoding:NSUTF8StringEncoding]; //stores the cstring value of retval in value
 			[retval release];
 			[propertyString release];
 			[configurator release];

diff --git a/runtimes/cpp/platforms/iphone/Classes/notifications/NotificationManager.mm b/runtimes/cpp/platforms/iphone/Classes/notifications/NotificationManager.mm
@@ -330,7 +330,7 @@ -(int) localNotificationGetProperty:(MAHandle) notificationHandle
 		return MA_NOTIFICATION_RES_INVALID_STRING_BUFFER_SIZE;
 	}
 
-    [retVal getCString:value maxLength:length encoding:NSASCIIStringEncoding];
+    [retVal getCString:value maxLength:length encoding:NSUTF8StringEncoding];
 	[retVal release];
     return MA_NOTIFICATION_RES_OK;
 }
@@ -589,7 +589,7 @@ -(int) getPushNotificationData:(MAHandle) pushNotificationHandle
             NSLog(@"NotificationManager::getPushNotificationData Buffer too small.");
             return MA_NOTIFICATION_RES_INVALID_STRING_BUFFER_SIZE;
         }
-        [messageAlert getCString:charAddress maxLength:maxLength encoding:NSASCIIStringEncoding];
+        [messageAlert getCString:charAddress maxLength:maxLength encoding:NSUTF8StringEncoding];
         pushNotificationType = pushNotificationType | MA_NOTIFICATION_PUSH_TYPE_ALERT;
     }
 
@@ -605,7 +605,7 @@ -(int) getPushNotificationData:(MAHandle) pushNotificationHandle
             NSLog(@"NotificationManager::getPushNotificationData Buffer too small.");
             return MA_NOTIFICATION_RES_INVALID_STRING_BUFFER_SIZE;
         }
-        [soundFileName getCString:charAddress maxLength:maxLength encoding:NSASCIIStringEncoding];
+        [soundFileName getCString:charAddress maxLength:maxLength encoding:NSUTF8StringEncoding];
         pushNotificationType = pushNotificationType | MA_NOTIFICATION_PUSH_TYPE_SOUND;
     }
 
@@ -683,7 +683,7 @@ -(int) getPushRegistrationData:(char*) messageAddress
         return MA_NOTIFICATION_RES_REGISTRATION_MESSAGE_BUF_TOO_SMALL;
     }
 
-    [messageString getCString:messageAddress maxLength:size encoding:NSASCIIStringEncoding];
+    [messageString getCString:messageAddress maxLength:size encoding:NSUTF8StringEncoding];
     return result;
 }
 

diff --git a/runtimes/cpp/platforms/iphone/Classes/purchase/PurchaseProduct.mm b/runtimes/cpp/platforms/iphone/Classes/purchase/PurchaseProduct.mm
@@ -250,7 +250,7 @@ -(int) productName:(char*) buffer
         return MA_PURCHASE_RES_BUFFER_TOO_SMALL;
     }
 
-    [_productID getCString:buffer maxLength:bufferSize encoding:NSASCIIStringEncoding];
+    [_productID getCString:buffer maxLength:bufferSize encoding:NSUTF8StringEncoding];
     return [_productID length];
 }
 
@@ -332,7 +332,7 @@ -(int) getReceiptField:(const char*) fieldName
         return MA_PURCHASE_RES_BUFFER_TOO_SMALL;
     }
 
-    [fieldValue getCString:buffer maxLength:bufferSize encoding:NSASCIIStringEncoding];
+    [fieldValue getCString:buffer maxLength:bufferSize encoding:NSUTF8StringEncoding];
     return fieldValueLength;
 }
 

diff --git a/runtimes/cpp/platforms/sdl/MacDialogs.mm b/runtimes/cpp/platforms/sdl/MacDialogs.mm
@@ -20,7 +20,7 @@
 #import <Cocoa/Cocoa.h>
 
 void MacMessageBox(const char* msg, const char* title) {
-	NSString *nstitle = [NSString stringWithCString:title encoding:NSASCIIStringEncoding];
-	NSString *nsmessage = [NSString stringWithCString:msg encoding:NSASCIIStringEncoding];
+	NSString *nstitle = [NSString stringWithCString:title encoding:NSUTF8StringEncoding];
+	NSString *nsmessage = [NSString stringWithCString:msg encoding:NSUTF8StringEncoding];
 	NSRunAlertPanel(nstitle, nsmessage, @"OK", NULL, NULL);
 }
diff --git a/testPrograms/native_ui/iphone/Classes/MoSyncUISyscalls.mm b/testPrograms/native_ui/iphone/Classes/MoSyncUISyscalls.mm
@@ -89,7 +89,7 @@ int maWidgetGetProperty(MAHandle handle, const char *property, char *value, int
 		return -1;
 	}
 
-	[retval getCString:value maxLength:length encoding:NSASCIIStringEncoding];
+	[retval getCString:value maxLength:length encoding:NSUTF8StringEncoding];
 	return realLength;
 }
 

diff --git a/tests/Benchmarks/database_libs/ios/benchdb/BenchDB.m b/tests/Benchmarks/database_libs/ios/benchdb/BenchDB.m
@@ -22,12 +22,12 @@ - (id) init{
 - (int) submit:(struct BenchResult)br {
 
 	br.revision = "0";
-	br.runtime = [[[[UIDevice currentDevice] systemName] stringByAddingPercentEscapesUsingEncoding: NSASCIIStringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
+	br.runtime = [[[[UIDevice currentDevice] systemName] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
 	br.git_hash = "0";
-	br.phone = [[[[UIDevice currentDevice] name] stringByAddingPercentEscapesUsingEncoding: NSASCIIStringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
+	br.phone = [[[[UIDevice currentDevice] name] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
 ;//[[[UIDevice currentDevice] model] cStringUsingEncoding:NSUTF8StringEncoding];
 	printf("__VERSION__ %s\n", __VERSION__);
-	br.nativeSdkVer = [[[NSString stringWithUTF8String: __VERSION__] stringByAddingPercentEscapesUsingEncoding: NSASCIIStringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
+	br.nativeSdkVer = [[[NSString stringWithUTF8String: __VERSION__] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding ] cStringUsingEncoding:NSUTF8StringEncoding];
 
 	//build url-string
 	NSString *url = [NSString stringWithCString:M_URL encoding:NSUTF8StringEncoding];