mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
allow UTF8 strings
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37361 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
9530102d98
commit
2d8469f9d9
1 changed files with 9 additions and 8 deletions
|
@ -4334,9 +4334,10 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
}
|
||||
|
||||
/**
|
||||
* Converts the base64 encoded data in source to a decoded ASCII string
|
||||
* using the +decodeBase64: method. If the encoded data does not represent
|
||||
* an ASCII string, you should use the +decodeBase64: method directly.
|
||||
* Converts the base64 encoded data in source to a decoded ASCII or UTF8
|
||||
* string using the +decodeBase64: method. If the encoded data does not
|
||||
* represent an ASCII or UTF8 string, you should use the +decodeBase64:
|
||||
* method directly.
|
||||
*/
|
||||
+ (NSString*) decodeBase64String: (NSString*)source
|
||||
{
|
||||
|
@ -4347,7 +4348,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
if (d != nil)
|
||||
{
|
||||
r = [NSStringClass allocWithZone: NSDefaultMallocZone()];
|
||||
r = [r initWithData: d encoding: NSASCIIStringEncoding];
|
||||
r = [r initWithData: d encoding: NSUTF8StringEncoding];
|
||||
IF_NO_GC([r autorelease];)
|
||||
}
|
||||
return r;
|
||||
|
@ -4399,13 +4400,13 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
}
|
||||
|
||||
/**
|
||||
* Converts the ASCII string source into base64 encoded data using the
|
||||
* +encodeBase64: method. If the original data is not an ASCII string,
|
||||
* you should use the +encodeBase64: method directly.
|
||||
* Converts the ASCII or UTF8 string source into base64 encoded data using
|
||||
* the +encodeBase64: method. If the original data is not an ASCII or UTF8
|
||||
* string, you should use the +encodeBase64: method directly.
|
||||
*/
|
||||
+ (NSString*) encodeBase64String: (NSString*)source
|
||||
{
|
||||
NSData *d = [source dataUsingEncoding: NSASCIIStringEncoding];
|
||||
NSData *d = [source dataUsingEncoding: NSUTF8StringEncoding];
|
||||
NSString *r = nil;
|
||||
|
||||
d = [self encodeBase64: d];
|
||||
|
|
Loading…
Reference in a new issue