Index: src/OFMethodSignature.m ================================================================== --- src/OFMethodSignature.m +++ src/OFMethodSignature.m @@ -30,13 +30,13 @@ static size_t alignmentOfEncoding(const char **type, size_t *length, bool inStruct); static size_t sizeOfEncoding(const char **type, size_t *length); static size_t -alignofArray(const char **type, size_t *length) +alignmentOfArray(const char **type, size_t *length) { - size_t align; + size_t alignment; assert(*length > 0); (*type)++; (*length)--; @@ -44,25 +44,25 @@ while (*length > 0 && OFASCIIIsDigit(**type)) { (*type)++; (*length)--; } - align = alignmentOfEncoding(type, length, true); + alignment = alignmentOfEncoding(type, length, true); if (*length == 0 || **type != ']') @throw [OFInvalidFormatException exception]; (*type)++; (*length)--; - return align; + return alignment; } static size_t -alignofStruct(const char **type, size_t *length) +alignmentOfStruct(const char **type, size_t *length) { - size_t align = 0; + size_t alignment = 0; #if defined(OF_POWERPC) && defined(OF_MACOS) bool first = true; #endif assert(*length > 0); @@ -82,36 +82,36 @@ /* Skip '=' */ (*type)++; (*length)--; while (*length > 0 && **type != '}') { - size_t fieldAlign = alignmentOfEncoding(type, length, true); + size_t fieldAlignment = alignmentOfEncoding(type, length, true); #if defined(OF_POWERPC) && defined(OF_MACOS) - if (!first && fieldAlign > 4) - fieldAlign = 4; + if (!first && fieldAlignment > 4) + fieldAlignment = 4; first = false; #endif - if (fieldAlign > align) - align = fieldAlign; + if (fieldAlignment > alignment) + alignment = fieldAlignment; } if (*length == 0 || **type != '}') @throw [OFInvalidFormatException exception]; (*type)++; (*length)--; - return align; + return alignment; } static size_t -alignofUnion(const char **type, size_t *length) +alignmentOfUnion(const char **type, size_t *length) { - size_t align = 0; + size_t alignment = 0; assert(*length > 0); (*type)++; (*length)--; @@ -128,29 +128,29 @@ /* Skip '=' */ (*type)++; (*length)--; while (*length > 0 && **type != ')') { - size_t fieldAlign = alignmentOfEncoding(type, length, true); + size_t fieldAlignment = alignmentOfEncoding(type, length, true); - if (fieldAlign > align) - align = fieldAlign; + if (fieldAlignment > alignment) + alignment = fieldAlignment; } if (*length == 0 || **type != ')') @throw [OFInvalidFormatException exception]; (*type)++; (*length)--; - return align; + return alignment; } static size_t alignmentOfEncoding(const char **type, size_t *length, bool inStruct) { - size_t align; + size_t alignment; if (*length == 0) @throw [OFInvalidFormatException exception]; if (**type == 'r') { @@ -162,82 +162,82 @@ } switch (**type) { case 'c': case 'C': - align = OF_ALIGNOF(char); + alignment = OF_ALIGNOF(char); break; case 'i': case 'I': - align = OF_ALIGNOF(int); + alignment = OF_ALIGNOF(int); break; case 's': case 'S': - align = OF_ALIGNOF(short); + alignment = OF_ALIGNOF(short); break; case 'l': case 'L': - align = OF_ALIGNOF(long); + alignment = OF_ALIGNOF(long); break; case 'q': case 'Q': #if defined(OF_X86) && !defined(OF_WINDOWS) if (inStruct) - align = 4; + alignment = 4; else #endif - align = OF_ALIGNOF(long long); + alignment = OF_ALIGNOF(long long); break; #ifdef __SIZEOF_INT128__ case 't': case 'T': - align = __extension__ OF_ALIGNOF(__int128); + alignment = __extension__ OF_ALIGNOF(__int128); break; #endif case 'f': - align = OF_ALIGNOF(float); + alignment = OF_ALIGNOF(float); break; case 'd': #if defined(OF_X86) && !defined(OF_WINDOWS) if (inStruct) - align = 4; + alignment = 4; else #endif - align = OF_ALIGNOF(double); + alignment = OF_ALIGNOF(double); break; case 'D': #if defined(OF_X86) && !defined(OF_WINDOWS) if (inStruct) - align = 4; + alignment = 4; else #endif - align = OF_ALIGNOF(long double); + alignment = OF_ALIGNOF(long double); break; case 'B': - align = OF_ALIGNOF(_Bool); + alignment = OF_ALIGNOF(_Bool); break; case 'v': - align = 0; + alignment = 0; break; case '*': - align = OF_ALIGNOF(char *); + alignment = OF_ALIGNOF(char *); break; case '@': - align = OF_ALIGNOF(id); + alignment = OF_ALIGNOF(id); break; case '#': - align = OF_ALIGNOF(Class); + alignment = OF_ALIGNOF(Class); break; case ':': - align = OF_ALIGNOF(SEL); + alignment = OF_ALIGNOF(SEL); break; case '[': - return alignofArray(type, length); + return alignmentOfArray(type, length); case '{': - return alignofStruct(type, length); + return alignmentOfStruct(type, length); case '(': - return alignofUnion(type, length); + return alignmentOfUnion(type, length); case '^': /* Just to skip over the rest */ (*type)++; (*length)--; alignmentOfEncoding(type, length, false); @@ -251,22 +251,22 @@ if (*length == 0) @throw [OFInvalidFormatException exception]; switch (**type) { case 'f': - align = OF_ALIGNOF(float _Complex); + alignment = OF_ALIGNOF(float _Complex); break; case 'd': # if defined(OF_X86) && !defined(OF_WINDOWS) if (inStruct) - align = 4; + alignment = 4; else # endif - align = OF_ALIGNOF(double _Complex); + alignment = OF_ALIGNOF(double _Complex); break; case 'D': - align = OF_ALIGNOF(long double _Complex); + alignment = OF_ALIGNOF(long double _Complex); break; default: @throw [OFInvalidFormatException exception]; } @@ -277,15 +277,15 @@ } (*type)++; (*length)--; - return align; + return alignment; } static size_t -sizeofArray(const char **type, size_t *length) +sizeOfArray(const char **type, size_t *length) { size_t count = 0; size_t size; assert(*length > 0); @@ -316,16 +316,16 @@ return count * size; } static size_t -sizeofStruct(const char **type, size_t *length) +sizeOfStruct(const char **type, size_t *length) { size_t size = 0; const char *typeCopy = *type; size_t lengthCopy = *length; - size_t alignment = alignofStruct(&typeCopy, &lengthCopy); + size_t alignment = alignmentOfStruct(&typeCopy, &lengthCopy); #if defined(OF_POWERPC) && defined(OF_MACOS) bool first = true; #endif assert(*length > 0); @@ -345,26 +345,28 @@ /* Skip '=' */ (*type)++; (*length)--; while (*length > 0 && **type != '}') { - size_t fieldSize, fieldAlign; + size_t fieldSize, fieldAlignment; typeCopy = *type; lengthCopy = *length; fieldSize = sizeOfEncoding(type, length); - fieldAlign = alignmentOfEncoding(&typeCopy, &lengthCopy, true); + fieldAlignment = alignmentOfEncoding(&typeCopy, &lengthCopy, + true); #if defined(OF_POWERPC) && defined(OF_MACOS) - if (!first && fieldAlign > 4) - fieldAlign = 4; + if (!first && fieldAlignment > 4) + fieldAlignment = 4; first = false; #endif - if (size % fieldAlign != 0) { - size_t padding = fieldAlign - (size % fieldAlign); + if (size % fieldAlignment != 0) { + size_t padding = + fieldAlignment - (size % fieldAlignment); if (SIZE_MAX - size < padding) @throw [OFOutOfRangeException exception]; size += padding; @@ -393,11 +395,11 @@ return size; } static size_t -sizeofUnion(const char **type, size_t *length) +sizeOfUnion(const char **type, size_t *length) { size_t size = 0; assert(*length > 0); @@ -502,15 +504,15 @@ break; case ':': size = sizeof(SEL); break; case '[': - return sizeofArray(type, length); + return sizeOfArray(type, length); case '{': - return sizeofStruct(type, length); + return sizeOfStruct(type, length); case '(': - return sizeofUnion(type, length); + return sizeOfUnion(type, length); case '^': /* Just to skip over the rest */ (*type)++; (*length)--; sizeOfEncoding(type, length); Index: src/OFMutableURL.m ================================================================== --- src/OFMutableURL.m +++ src/OFMutableURL.m @@ -53,11 +53,11 @@ - (void)setURLEncodedScheme: (OFString *)URLEncodedScheme { OFString *old; if (URLEncodedScheme != nil) - OFURLVerifyEscaped(URLEncodedScheme, + OFURLVerifyIsEscaped(URLEncodedScheme, [OFCharacterSet URLSchemeAllowedCharacterSet]); old = _URLEncodedScheme; _URLEncodedScheme = [URLEncodedScheme copy]; [old release]; @@ -89,11 +89,11 @@ [URLEncodedHost hasSuffix: @"]"]) { if (!OFURLIsIPv6Host([URLEncodedHost substringWithRange: OFRangeMake(1, URLEncodedHost.length - 2)])) @throw [OFInvalidFormatException exception]; } else if (URLEncodedHost != nil) - OFURLVerifyEscaped(URLEncodedHost, + OFURLVerifyIsEscaped(URLEncodedHost, [OFCharacterSet URLHostAllowedCharacterSet]); old = _URLEncodedHost; _URLEncodedHost = [URLEncodedHost copy]; [old release]; @@ -122,11 +122,11 @@ - (void)setURLEncodedUser: (OFString *)URLEncodedUser { OFString *old; if (URLEncodedUser != nil) - OFURLVerifyEscaped(URLEncodedUser, + OFURLVerifyIsEscaped(URLEncodedUser, [OFCharacterSet URLUserAllowedCharacterSet]); old = _URLEncodedUser; _URLEncodedUser = [URLEncodedUser copy]; [old release]; @@ -149,11 +149,11 @@ - (void)setURLEncodedPassword: (OFString *)URLEncodedPassword { OFString *old; if (URLEncodedPassword != nil) - OFURLVerifyEscaped(URLEncodedPassword, + OFURLVerifyIsEscaped(URLEncodedPassword, [OFCharacterSet URLPasswordAllowedCharacterSet]); old = _URLEncodedPassword; _URLEncodedPassword = [URLEncodedPassword copy]; [old release]; @@ -175,11 +175,11 @@ - (void)setURLEncodedPath: (OFString *)URLEncodedPath { OFString *old; if (URLEncodedPath != nil) - OFURLVerifyEscaped(URLEncodedPath, + OFURLVerifyIsEscaped(URLEncodedPath, [OFCharacterSet URLPathAllowedCharacterSet]); old = _URLEncodedPath; _URLEncodedPath = [URLEncodedPath copy]; [old release]; @@ -221,11 +221,11 @@ - (void)setURLEncodedQuery: (OFString *)URLEncodedQuery { OFString *old; if (URLEncodedQuery != nil) - OFURLVerifyEscaped(URLEncodedQuery, + OFURLVerifyIsEscaped(URLEncodedQuery, [OFCharacterSet URLQueryAllowedCharacterSet]); old = _URLEncodedQuery; _URLEncodedQuery = [URLEncodedQuery copy]; [old release]; @@ -289,11 +289,11 @@ - (void)setURLEncodedFragment: (OFString *)URLEncodedFragment { OFString *old; if (URLEncodedFragment != nil) - OFURLVerifyEscaped(URLEncodedFragment, + OFURLVerifyIsEscaped(URLEncodedFragment, [OFCharacterSet URLFragmentAllowedCharacterSet]); old = _URLEncodedFragment; _URLEncodedFragment = [URLEncodedFragment copy]; [old release]; Index: src/OFSPXSocket.m ================================================================== --- src/OFSPXSocket.m +++ src/OFSPXSocket.m @@ -30,11 +30,11 @@ #ifndef NSPROTO_SPX # define NSPROTO_SPX 0 #endif -#define SPX_PACKET_TYPE 5 +static const uint8_t SPXPacketType = 5; @interface OFSPXSocket () - (int)of_createSocketForAddress: (const OFSocketAddress *)address errNo: (int *)errNo; - (bool)of_connectSocketToAddress: (const OFSocketAddress *)address @@ -325,11 +325,11 @@ if ((_socket = socket(address.sockaddr.sockaddr.sa_family, SOCK_SEQPACKET | SOCK_CLOEXEC, NSPROTO_SPX)) == OFInvalidSocketHandle) @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: OFSocketErrNo()]; _canBlock = true; @@ -343,11 +343,11 @@ closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: errNo]; } memset(&address, 0, sizeof(address)); @@ -360,23 +360,23 @@ closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: errNo]; } if (address.sockaddr.sockaddr.sa_family != AF_IPX) { closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: EAFNOSUPPORT]; } return address; } @end Index: src/OFSPXStreamSocket.m ================================================================== --- src/OFSPXStreamSocket.m +++ src/OFSPXStreamSocket.m @@ -30,11 +30,11 @@ #ifndef NSPROTO_SPX # define NSPROTO_SPX 0 #endif -#define SPX_PACKET_TYPE 5 +static const uint8_t SPXPacketType = 5; @interface OFSPXStreamSocket () - (int)of_createSocketForAddress: (const OFSocketAddress *)address errNo: (int *)errNo; - (bool)of_connectSocketToAddress: (const OFSocketAddress *)address @@ -326,11 +326,11 @@ if ((_socket = socket(address.sockaddr.sockaddr.sa_family, SOCK_STREAM | SOCK_CLOEXEC, NSPROTO_SPX)) == OFInvalidSocketHandle) @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: OFSocketErrNo()]; _canBlock = true; @@ -344,11 +344,11 @@ closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: errNo]; } memset(&address, 0, sizeof(address)); @@ -361,23 +361,23 @@ closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: errNo]; } if (address.sockaddr.sockaddr.sa_family != AF_IPX) { closesocket(_socket); _socket = OFInvalidSocketHandle; @throw [OFBindFailedException exceptionWithPort: port - packetType: SPX_PACKET_TYPE + packetType: SPXPacketType socket: self errNo: EAFNOSUPPORT]; } return address; } @end Index: src/OFURL.h ================================================================== --- src/OFURL.h +++ src/OFURL.h @@ -366,13 +366,13 @@ #ifdef __cplusplus extern "C" { #endif extern bool OFURLIsIPv6Host(OFString *host); -extern void OFURLVerifyEscaped(OFString *, OFCharacterSet *); +extern void OFURLVerifyIsEscaped(OFString *, OFCharacterSet *); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END #import "OFMutableURL.h" Index: src/OFURL.m ================================================================== --- src/OFURL.m +++ src/OFURL.m @@ -321,11 +321,11 @@ @selector(characterIsMember:), character)); } @end void -OFURLVerifyEscaped(OFString *string, OFCharacterSet *characterSet) +OFURLVerifyIsEscaped(OFString *string, OFCharacterSet *characterSet) { void *pool = objc_autoreleasePoolPush(); characterSet = [[[OFInvertedCharacterSetWithoutPercent alloc] initWithCharacterSet: characterSet] autorelease]; @@ -460,11 +460,11 @@ _URLEncodedScheme = [[OFString alloc] initWithUTF8String: UTF8String length: tmp - UTF8String]; - OFURLVerifyEscaped(_URLEncodedScheme, + OFURLVerifyIsEscaped(_URLEncodedScheme, [OFCharacterSet URLSchemeAllowedCharacterSet]); UTF8String = tmp + 3; if ((tmp = strchr(UTF8String, '/')) != NULL) { @@ -485,18 +485,18 @@ _URLEncodedUser = [[OFString alloc] initWithUTF8String: UTF8String]; _URLEncodedPassword = [[OFString alloc] initWithUTF8String: tmp3]; - OFURLVerifyEscaped(_URLEncodedPassword, + OFURLVerifyIsEscaped(_URLEncodedPassword, [OFCharacterSet URLPasswordAllowedCharacterSet]); } else _URLEncodedUser = [[OFString alloc] initWithUTF8String: UTF8String]; - OFURLVerifyEscaped(_URLEncodedUser, + OFURLVerifyIsEscaped(_URLEncodedUser, [OFCharacterSet URLUserAllowedCharacterSet]); UTF8String = tmp2; } @@ -565,21 +565,21 @@ } else _URLEncodedHost = [[OFString alloc] initWithUTF8String: UTF8String]; if (!isIPv6Host) - OFURLVerifyEscaped(_URLEncodedHost, + OFURLVerifyIsEscaped(_URLEncodedHost, [OFCharacterSet URLHostAllowedCharacterSet]); if ((UTF8String = tmp) != NULL) { if ((tmp = strchr(UTF8String, '#')) != NULL) { *tmp = '\0'; _URLEncodedFragment = [[OFString alloc] initWithUTF8String: tmp + 1]; - OFURLVerifyEscaped(_URLEncodedFragment, + OFURLVerifyIsEscaped(_URLEncodedFragment, [OFCharacterSet URLFragmentAllowedCharacterSet]); } if ((tmp = strchr(UTF8String, '?')) != NULL) { @@ -586,11 +586,11 @@ *tmp = '\0'; _URLEncodedQuery = [[OFString alloc] initWithUTF8String: tmp + 1]; - OFURLVerifyEscaped(_URLEncodedQuery, + OFURLVerifyIsEscaped(_URLEncodedQuery, [OFCharacterSet URLQueryAllowedCharacterSet]); } UTF8String--; @@ -597,11 +597,11 @@ *UTF8String = '/'; _URLEncodedPath = [[OFString alloc] initWithUTF8String: UTF8String]; - OFURLVerifyEscaped(_URLEncodedPath, + OFURLVerifyIsEscaped(_URLEncodedPath, [OFCharacterSet URLPathAllowedCharacterSet]); } objc_autoreleasePoolPop(pool); } @catch (id e) { @@ -643,20 +643,20 @@ if ((tmp = strchr(UTF8String, '#')) != NULL) { *tmp = '\0'; _URLEncodedFragment = [[OFString alloc] initWithUTF8String: tmp + 1]; - OFURLVerifyEscaped(_URLEncodedFragment, + OFURLVerifyIsEscaped(_URLEncodedFragment, [OFCharacterSet URLFragmentAllowedCharacterSet]); } if ((tmp = strchr(UTF8String, '?')) != NULL) { *tmp = '\0'; _URLEncodedQuery = [[OFString alloc] initWithUTF8String: tmp + 1]; - OFURLVerifyEscaped(_URLEncodedQuery, + OFURLVerifyIsEscaped(_URLEncodedQuery, [OFCharacterSet URLQueryAllowedCharacterSet]); } if (*UTF8String == '/') _URLEncodedPath = [[OFString alloc] @@ -692,11 +692,11 @@ _URLEncodedPath = [path copy]; } } - OFURLVerifyEscaped(_URLEncodedPath, + OFURLVerifyIsEscaped(_URLEncodedPath, [OFCharacterSet URLPathAllowedCharacterSet]); objc_autoreleasePoolPop(pool); } @catch (id e) { [self release];