gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidy to match conding conventions

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38721 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2015-06-30 08:41:38 +00:00
parent bf8feff38b
commit 781c9c6118
2 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/Foundation/NSData.h
View file

@ -123,8 +123,8 @@ enum {
// base64
#if OS_API_VERSION(MAC_OS_X_VERSION_10_9,GS_API_LATEST)
- (NSData *)base64EncodedDataWithOptions:(NSDataBase64EncodingOptions)options;
- (NSString *)base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)options;
- (NSData *) base64EncodedDataWithOptions: (NSDataBase64EncodingOptions)options;
- (NSString *) base64EncodedStringWithOptions: (NSDataBase64EncodingOptions)options;
#endif
// Querying a Data Object

54
Source/NSData.m
View file

@ -150,8 +150,14 @@ decodebase64(unsigned char *dst, const unsigned char *src)
static char b64[]
= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static const int crlf64 = NSDataBase64EncodingEndLineWithCarriageReturn
| NSDataBase64EncodingEndLineWithLineFeed;
static NSUInteger
encodebase64(unsigned char **dstRef, const unsigned char *src, NSUInteger length, NSDataBase64EncodingOptions options)
encodebase64(unsigned char **dstRef,
const unsigned char *src,
NSUInteger length,
NSDataBase64EncodingOptions options)
{
unsigned char *dst;
NSUInteger dIndex = 0;
@ -166,11 +172,12 @@ encodebase64(unsigned char **dstRef, const unsigned char *src, NSUInteger length
else if (options & NSDataBase64Encoding76CharacterLineLength)
lineLength = 76;
/* if no EndLine options are set but a line length is given, CR+LF is implied */
if (lineLength && !(options & NSDataBase64EncodingEndLineWithCarriageReturn) && !(options & NSDataBase64EncodingEndLineWithLineFeed))
/* if no EndLine options are set but a line length is given,
* CR+LF is implied
*/
if (lineLength && !(options & crlf64))
{
options |= NSDataBase64EncodingEndLineWithCarriageReturn;
options |= NSDataBase64EncodingEndLineWithLineFeed;
options |= crlf64;
}
/* estimate destination length */
@ -178,10 +185,10 @@ encodebase64(unsigned char **dstRef, const unsigned char *src, NSUInteger length
/* we need to take in account line-endings */
if (lineLength)
{
if (options & (NSDataBase64EncodingEndLineWithCarriageReturn | NSDataBase64EncodingEndLineWithLineFeed))
destLen += (destLen / lineLength)*2;
if ((options & crlf64) == crlf64)
destLen += (destLen / lineLength)*2; // CR and LF
else
destLen += (destLen / lineLength);
destLen += (destLen / lineLength); // CR or LF
}
#if GS_WITH_GC
@ -1041,29 +1048,38 @@ failure:
return [NSData dataWithBytesNoCopy: buffer length: aRange.length];
}
- (NSData *)base64EncodedDataWithOptions:(NSDataBase64EncodingOptions)options
- (NSData *) base64EncodedDataWithOptions: (NSDataBase64EncodingOptions)options
{
void *srcBytes = (void*)[self bytes];
NSUInteger length = [self length];
NSUInteger resLen;
void *srcBytes = (void*)[self bytes];
NSUInteger length = [self length];
NSUInteger resLen;
unsigned char *resBytes;
NSData *result;
resLen = encodebase64(&resBytes, srcBytes, length, options);
return AUTORELEASE([[NSData alloc] initWithBytesNoCopy: resBytes length: resLen freeWhenDone: YES]);
result = [[NSData alloc] initWithBytesNoCopy: resBytes
length: resLen
freeWhenDone: YES];
return AUTORELEASE(result);
}
- (NSString *)base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)options
- (NSString *) base64EncodedStringWithOptions:
(NSDataBase64EncodingOptions)options
{
void *srcBytes = (void*)[self bytes];
NSUInteger length = [self length];
NSUInteger resLen;
void *srcBytes = (void*)[self bytes];
NSUInteger length = [self length];
NSUInteger resLen;
unsigned char *resBytes;
NSString *result;
resLen = encodebase64(&resBytes, srcBytes, length, options);
return AUTORELEASE([[NSString alloc] initWithBytesNoCopy: resBytes length: resLen encoding: NSASCIIStringEncoding freeWhenDone: YES]);
result = [[NSString alloc] initWithBytesNoCopy: resBytes
length: resLen
encoding: NSASCIIStringEncoding
freeWhenDone: YES];
return AUTORELEASE(result);
}
- (NSUInteger) hash
{
unsigned char buf[64];