diff options
| author | Max <dmoagx@users.noreply.github.com> | 2018-05-02 01:32:11 +0200 |
|---|---|---|
| committer | Max <dmoagx@users.noreply.github.com> | 2018-05-02 01:32:11 +0200 |
| commit | 7f35608f0ab5f9192245a5bc8dd74da793788389 (patch) | |
| tree | 0cbbfb717e96c79346ea0be18e852cb6931d4300 /Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m | |
| parent | 5bd7cde2e69991b5cd9bde424c45e2da5bb34292 (diff) | |
| download | sequelpro-7f35608f0ab5f9192245a5bc8dd74da793788389.tar.gz sequelpro-7f35608f0ab5f9192245a5bc8dd74da793788389.tar.bz2 sequelpro-7f35608f0ab5f9192245a5bc8dd74da793788389.zip | |
* More formatting changes
* Fix an unintended switch/case fallthrough (the error got caught soon afterwards, so this never really caused problems)
* Fix a typo in the mysql fallback charset mappings (119 should’ve been 199)
* Fix a charset confusion issue (SPMySQL’s compiled-in C strings are in UTF-8, not the connection encoding of the mysql connection)
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m')
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m b/Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m index f987c98b..191b216e 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m @@ -57,13 +57,13 @@ */ + (NSString *) stringForDataBytes:(const void *)dataBytes length:(NSUInteger)dataLength encoding:(NSStringEncoding)aStringEncoding { - NSString * string = [[[NSString alloc] initWithBytes:dataBytes length:dataLength encoding:aStringEncoding] autorelease]; - - if (string == nil) { - return [[[NSString alloc] initWithBytes:dataBytes length:dataLength encoding:NSASCIIStringEncoding] autorelease]; - } - - return string; + NSString *string = [[[NSString alloc] initWithBytes:dataBytes length:dataLength encoding:aStringEncoding] autorelease]; + + if (string == nil) { + return [[[NSString alloc] initWithBytes:dataBytes length:dataLength encoding:NSASCIIStringEncoding] autorelease]; + } + + return string; } @end |