Index: generators/unicode/TableGenerator.h ================================================================== --- generators/unicode/TableGenerator.h +++ generators/unicode/TableGenerator.h @@ -39,12 +39,12 @@ size_t _titlecaseTableSize; size_t _caseFoldingTableSize; size_t _decompositionTableSize; size_t _decompositionCompatTableSize; enum { - STATE_UNICODE_DATA, - STATE_CASE_FOLDING + stateUnicodeData, + stateCaseFolding } _state; } - (void)parseUnicodeData: (OFHTTPResponse *)response; - (void)parseCaseFolding: (OFHTTPResponse *)response; Index: generators/unicode/TableGenerator.m ================================================================== --- generators/unicode/TableGenerator.m +++ generators/unicode/TableGenerator.m @@ -65,11 +65,11 @@ - (void)applicationDidFinishLaunching { OFHTTPRequest *request; [OFStdOut writeString: @"Downloading UnicodeData.txt…"]; - _state = STATE_UNICODE_DATA; + _state = stateUnicodeData; request = [OFHTTPRequest requestWithURL: [OFURL URLWithString: unicodeDataURL]]; [_HTTPClient asyncPerformRequest: request]; } @@ -82,14 +82,14 @@ @throw exception; [OFStdOut writeLine: @" done"]; switch (_state) { - case STATE_UNICODE_DATA: + case stateUnicodeData: [self parseUnicodeData: response]; break; - case STATE_CASE_FOLDING: + case stateCaseFolding: [self parseCaseFolding: response]; break; } } @@ -165,11 +165,11 @@ [self applyDecompositionRecursivelyForTable: _decompositionCompatTable]; [OFStdOut writeLine: @" done"]; [OFStdOut writeString: @"Downloading CaseFolding.txt…"]; - _state = STATE_CASE_FOLDING; + _state = stateCaseFolding; request = [OFHTTPRequest requestWithURL: [OFURL URLWithString: caseFoldingURL]]; [_HTTPClient asyncPerformRequest: request]; } Index: src/OFASPrintF.m ================================================================== --- src/OFASPrintF.m +++ src/OFASPrintF.m @@ -61,26 +61,26 @@ va_list arguments; char *buffer; size_t bufferLen; size_t i, last; enum { - StateString, - StateFormatFlags, - StateFormatFieldWidth, - StateFormatLengthModifier, - StateFormatConversionSpecifier + stateString, + stateFormatFlags, + stateFormatFieldWidth, + stateFormatLengthModifier, + stateFormatConversionSpecifier } state; enum { - LengthModifierNone, - LengthModifierHH, - LengthModifierH, - LengthModifierL, - LengthModifierLL, - LengthModifierJ, - LengthModifierZ, - LengthModifierT, - LengthModifierCapitalL + lengthModifierNone, + lengthModifierHH, + lengthModifierH, + lengthModifierL, + lengthModifierLL, + lengthModifierJ, + lengthModifierZ, + lengthModifierT, + lengthModifierCapitalL } lengthModifier; bool useLocale; }; #ifdef HAVE_ASPRINTF_L @@ -192,11 +192,11 @@ if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; ctx->last = ctx->i + 1; - ctx->state = StateFormatFlags; + ctx->state = stateFormatFlags; } return true; } @@ -216,11 +216,11 @@ case ',': /* ObjFW extension: Use decimal point from locale */ ctx->useLocale = true; break; default: - ctx->state = StateFormatFieldWidth; + ctx->state = stateFormatFieldWidth; ctx->i--; break; } @@ -233,11 +233,11 @@ if ((ctx->format[ctx->i] >= '0' && ctx->format[ctx->i] <= '9') || ctx->format[ctx->i] == '*' || ctx->format[ctx->i] == '.') { if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; } else { - ctx->state = StateFormatLengthModifier; + ctx->state = stateFormatLengthModifier; ctx->i--; } return true; } @@ -252,16 +252,16 @@ ctx->format[ctx->i + 1] == 'h') { if (!appendSubformat(ctx, ctx->format + ctx->i, 2)) return false; ctx->i++; - ctx->lengthModifier = LengthModifierHH; + ctx->lengthModifier = lengthModifierHH; } else { if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; - ctx->lengthModifier = LengthModifierH; + ctx->lengthModifier = lengthModifierH; } break; case 'l': /* and also ll */ if (ctx->formatLen > ctx->i + 1 && @@ -273,16 +273,16 @@ if (!appendSubformat(ctx, "I64", 3)) return false; #endif ctx->i++; - ctx->lengthModifier = LengthModifierLL; + ctx->lengthModifier = lengthModifierLL; } else { if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; - ctx->lengthModifier = LengthModifierL; + ctx->lengthModifier = lengthModifierL; } break; case 'j': #if defined(OF_WINDOWS) @@ -294,11 +294,11 @@ #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif - ctx->lengthModifier = LengthModifierJ; + ctx->lengthModifier = lengthModifierJ; break; case 'z': #if defined(OF_WINDOWS) if (sizeof(size_t) == 8) @@ -310,11 +310,11 @@ #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif - ctx->lengthModifier = LengthModifierZ; + ctx->lengthModifier = lengthModifierZ; break; case 't': #if defined(OF_WINDOWS) if (sizeof(ptrdiff_t) == 8) @@ -326,18 +326,18 @@ #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif - ctx->lengthModifier = LengthModifierT; + ctx->lengthModifier = lengthModifierT; break; case 'L': if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; - ctx->lengthModifier = LengthModifierCapitalL; + ctx->lengthModifier = lengthModifierCapitalL; break; #ifdef OF_WINDOWS case 'I': /* win32 strangeness (I64 instead of ll or j) */ if (ctx->formatLen > ctx->i + 2 && @@ -345,11 +345,11 @@ ctx->format[ctx->i + 2] == '4') { if (!appendSubformat(ctx, ctx->format + ctx->i, 3)) return false; ctx->i += 2; - ctx->lengthModifier = LengthModifierLL; + ctx->lengthModifier = lengthModifierLL; } else ctx->i--; break; #endif @@ -356,21 +356,21 @@ #ifdef OF_IOS case 'q': /* iOS uses this for PRI?64 */ if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; - ctx->lengthModifier = LengthModifierLL; + ctx->lengthModifier = lengthModifierLL; break; #endif default: ctx->i--; break; } - ctx->state = StateFormatConversionSpecifier; + ctx->state = stateFormatConversionSpecifier; return true; } static bool formatConversionSpecifierState(struct context *ctx) @@ -384,11 +384,11 @@ if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; switch (ctx->format[ctx->i]) { case '@': - if (ctx->lengthModifier != LengthModifierNone) + if (ctx->lengthModifier != lengthModifierNone) return false; ctx->subformat[ctx->subformatLen - 1] = 's'; @try { @@ -409,11 +409,11 @@ @throw e; } break; case 'C': - if (ctx->lengthModifier != LengthModifierNone) + if (ctx->lengthModifier != lengthModifierNone) return false; ctx->subformat[ctx->subformatLen - 1] = 's'; { @@ -428,11 +428,11 @@ tmpLen = asprintf(&tmp, ctx->subformat, buffer); } break; case 'S': - if (ctx->lengthModifier != LengthModifierNone) + if (ctx->lengthModifier != lengthModifierNone) return false; ctx->subformat[ctx->subformatLen - 1] = 's'; { @@ -468,33 +468,33 @@ break; case 'd': case 'i': switch (ctx->lengthModifier) { - case LengthModifierNone: - case LengthModifierHH: - case LengthModifierH: + case lengthModifierNone: + case lengthModifierHH: + case lengthModifierH: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, int)); break; - case LengthModifierL: + case lengthModifierL: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, long)); break; - case LengthModifierLL: + case lengthModifierLL: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, long long)); break; - case LengthModifierJ: + case lengthModifierJ: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, intmax_t)); break; - case LengthModifierZ: + case lengthModifierZ: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, ssize_t)); break; - case LengthModifierT: + case lengthModifierT: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, ptrdiff_t)); break; default: return false; @@ -504,33 +504,33 @@ case 'o': case 'u': case 'x': case 'X': switch (ctx->lengthModifier) { - case LengthModifierNone: - case LengthModifierHH: - case LengthModifierH: + case lengthModifierNone: + case lengthModifierHH: + case lengthModifierH: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, unsigned int)); break; - case LengthModifierL: + case lengthModifierL: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, unsigned long)); break; - case LengthModifierLL: + case lengthModifierLL: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, unsigned long long)); break; - case LengthModifierJ: + case lengthModifierJ: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, uintmax_t)); break; - case LengthModifierZ: + case lengthModifierZ: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, size_t)); break; - case LengthModifierT: + case lengthModifierT: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, ptrdiff_t)); break; default: return false; @@ -544,12 +544,12 @@ case 'g': case 'G': case 'a': case 'A': switch (ctx->lengthModifier) { - case LengthModifierNone: - case LengthModifierL: + case lengthModifierNone: + case lengthModifierL: #ifdef HAVE_ASPRINTF_L if (!ctx->useLocale) tmpLen = asprintf_l(&tmp, cLocale, ctx->subformat, va_arg(ctx->arguments, double)); @@ -556,11 +556,11 @@ else #endif tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, double)); break; - case LengthModifierCapitalL: + case lengthModifierCapitalL: #ifdef HAVE_ASPRINTF_L if (!ctx->useLocale) tmpLen = asprintf_l(&tmp, cLocale, ctx->subformat, va_arg(ctx->arguments, long double)); @@ -611,15 +611,15 @@ #endif break; case 'c': switch (ctx->lengthModifier) { - case LengthModifierNone: + case lengthModifierNone: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, int)); break; - case LengthModifierL: + case lengthModifierL: #ifdef HAVE_WCHAR_H # if WINT_MAX >= INT_MAX tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, wint_t)); # else @@ -633,16 +633,16 @@ } break; case 's': switch (ctx->lengthModifier) { - case LengthModifierNone: + case lengthModifierNone: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, const char *)); break; #ifdef HAVE_WCHAR_T - case LengthModifierL: + case lengthModifierL: tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, const wchar_t *)); break; #endif default: @@ -649,57 +649,57 @@ return false; } break; case 'p': - if (ctx->lengthModifier != LengthModifierNone) + if (ctx->lengthModifier != lengthModifierNone) return false; tmpLen = asprintf(&tmp, ctx->subformat, va_arg(ctx->arguments, void *)); break; case 'n': switch (ctx->lengthModifier) { - case LengthModifierNone: + case lengthModifierNone: *va_arg(ctx->arguments, int *) = (int)ctx->bufferLen; break; - case LengthModifierHH: + case lengthModifierHH: *va_arg(ctx->arguments, signed char *) = (signed char)ctx->bufferLen; break; - case LengthModifierH: + case lengthModifierH: *va_arg(ctx->arguments, short *) = (short)ctx->bufferLen; break; - case LengthModifierL: + case lengthModifierL: *va_arg(ctx->arguments, long *) = (long)ctx->bufferLen; break; - case LengthModifierLL: + case lengthModifierLL: *va_arg(ctx->arguments, long long *) = (long long)ctx->bufferLen; break; - case LengthModifierJ: + case lengthModifierJ: *va_arg(ctx->arguments, intmax_t *) = (intmax_t)ctx->bufferLen; break; - case LengthModifierZ: + case lengthModifierZ: *va_arg(ctx->arguments, size_t *) = (size_t)ctx->bufferLen; break; - case LengthModifierT: + case lengthModifierT: *va_arg(ctx->arguments, ptrdiff_t *) = (ptrdiff_t)ctx->bufferLen; break; default: return false; } break; case '%': - if (ctx->lengthModifier != LengthModifierNone) + if (ctx->lengthModifier != lengthModifierNone) return false; if (!appendString(ctx, "%", 1)) return false; @@ -720,15 +720,15 @@ free(tmp); } memset(ctx->subformat, 0, maxSubformatLen); ctx->subformatLen = 0; - ctx->lengthModifier = LengthModifierNone; + ctx->lengthModifier = lengthModifierNone; ctx->useLocale = false; ctx->last = ctx->i + 1; - ctx->state = StateString; + ctx->state = stateString; return true; } static bool (*states[])(struct context *) = { @@ -749,12 +749,12 @@ memset(ctx.subformat, 0, maxSubformatLen + 1); ctx.subformatLen = 0; va_copy(ctx.arguments, arguments); ctx.bufferLen = 0; ctx.last = 0; - ctx.state = StateString; - ctx.lengthModifier = LengthModifierNone; + ctx.state = stateString; + ctx.lengthModifier = lengthModifierNone; ctx.useLocale = false; if ((ctx.buffer = malloc(1)) == NULL) return -1; @@ -763,11 +763,11 @@ free(ctx.buffer); return -1; } } - if (ctx.state != StateString) { + if (ctx.state != stateString) { free(ctx.buffer); return -1; } if (!appendString(&ctx, ctx.format + ctx.last, Index: src/OFHTTPCookie.m ================================================================== --- src/OFHTTPCookie.m +++ src/OFHTTPCookie.m @@ -69,50 +69,50 @@ OFString *string = [headerFields objectForKey: @"Set-Cookie"]; OFString *domain = URL.host; const OFUnichar *characters = string.characters; size_t length = string.length, last = 0; enum { - StatePreName, - StateName, - StateExpectValue, - StateValue, - StateQuotedValue, - StatePostQuotedValue, - StatePreAttrName, - StateAttrName, - StateAttrValue - } state = StatePreName; - OFString *name = nil, *value = nil; - - for (size_t i = 0; i < length; i++) { - switch (state) { - case StatePreName: - if (characters[i] != ' ') { - state = StateName; - last = i; - i--; - } - break; - case StateName: - if (characters[i] == '=') { - name = [string substringWithRange: - OFRangeMake(last, i - last)]; - state = StateExpectValue; - } - break; - case StateExpectValue: - if (characters[i] == '"') { - state = StateQuotedValue; - last = i + 1; - } else { - state = StateValue; - last = i; - } - - i--; - break; - case StateValue: + statePreName, + stateName, + stateExpectValue, + stateValue, + stateQuotedValue, + statePostQuotedValue, + statePreAttrName, + stateAttrName, + stateAttrValue + } state = statePreName; + OFString *name = nil, *value = nil; + + for (size_t i = 0; i < length; i++) { + switch (state) { + case statePreName: + if (characters[i] != ' ') { + state = stateName; + last = i; + i--; + } + break; + case stateName: + if (characters[i] == '=') { + name = [string substringWithRange: + OFRangeMake(last, i - last)]; + state = stateExpectValue; + } + break; + case stateExpectValue: + if (characters[i] == '"') { + state = stateQuotedValue; + last = i + 1; + } else { + state = stateValue; + last = i; + } + + i--; + break; + case stateValue: if (characters[i] == ';' || characters[i] == ',') { value = [string substringWithRange: OFRangeMake(last, i - last)]; [ret addObject: @@ -119,61 +119,61 @@ [OFHTTPCookie cookieWithName: name value: value domain: domain]]; state = (characters[i] == ';' - ? StatePreAttrName : StatePreName); + ? statePreAttrName : statePreName); } break; - case StateQuotedValue: + case stateQuotedValue: if (characters[i] == '"') { value = [string substringWithRange: OFRangeMake(last, i - last)]; [ret addObject: [OFHTTPCookie cookieWithName: name value: value domain: domain]]; - state = StatePostQuotedValue; + state = statePostQuotedValue; } break; - case StatePostQuotedValue: + case statePostQuotedValue: if (characters[i] == ';') - state = StatePreAttrName; + state = statePreAttrName; else if (characters[i] == ',') - state = StatePreName; + state = statePreName; else @throw [OFInvalidFormatException exception]; break; - case StatePreAttrName: + case statePreAttrName: if (characters[i] != ' ') { - state = StateAttrName; + state = stateAttrName; last = i; i--; } break; - case StateAttrName: + case stateAttrName: if (characters[i] == '=') { name = [string substringWithRange: OFRangeMake(last, i - last)]; - state = StateAttrValue; + state = stateAttrValue; last = i + 1; } else if (characters[i] == ';' || characters[i] == ',') { name = [string substringWithRange: OFRangeMake(last, i - last)]; handleAttribute(ret.lastObject, name, nil); state = (characters[i] == ';' - ? StatePreAttrName : StatePreName); + ? statePreAttrName : statePreName); } break; - case StateAttrValue: + case stateAttrValue: if (characters[i] == ';' || characters[i] == ',') { value = [string substringWithRange: OFRangeMake(last, i - last)]; /* @@ -196,47 +196,47 @@ break; handleAttribute(ret.lastObject, name, value); state = (characters[i] == ';' - ? StatePreAttrName : StatePreName); + ? statePreAttrName : statePreName); } break; } } switch (state) { - case StatePreName: - case StatePostQuotedValue: - case StatePreAttrName: + case statePreName: + case statePostQuotedValue: + case statePreAttrName: break; - case StateName: - case StateQuotedValue: + case stateName: + case stateQuotedValue: @throw [OFInvalidFormatException exception]; break; - case StateValue: + case stateValue: value = [string substringWithRange: OFRangeMake(last, length - last)]; [ret addObject: [OFHTTPCookie cookieWithName: name value: value domain: domain]]; break; /* We end up here if the cookie is just foo= */ - case StateExpectValue: + case stateExpectValue: [ret addObject: [OFHTTPCookie cookieWithName: name value: @"" domain: domain]]; break; - case StateAttrName: + case stateAttrName: if (last != length) { name = [string substringWithRange: OFRangeMake(last, length - last)]; handleAttribute(ret.lastObject, name, nil); } break; - case StateAttrValue: + case stateAttrValue: value = [string substringWithRange: OFRangeMake(last, length - last)]; handleAttribute(ret.lastObject, name, value); Index: src/OFHTTPResponse.m ================================================================== --- src/OFHTTPResponse.m +++ src/OFHTTPResponse.m @@ -120,58 +120,58 @@ encodingForContentType(OFString *contentType) { const char *UTF8String = contentType.UTF8String; size_t last, length = contentType.UTF8StringLength; enum { - StateType, - StateBeforeParamName, - StateParamName, - StateParamValueOrQuote, - StateParamValue, - StateParamQuotedValue, - StateAfterParamValue - } state = StateType; + stateType, + stateBeforeParamName, + stateParamName, + stateParamValueOrQuote, + stateParamValue, + stateParamQuotedValue, + stateAfterParamValue + } state = stateType; OFString *name = nil, *value = nil, *charset = nil; OFStringEncoding ret; last = 0; for (size_t i = 0; i < length; i++) { switch (state) { - case StateType: + case stateType: if (UTF8String[i] == ';') { - state = StateBeforeParamName; + state = stateBeforeParamName; last = i + 1; } break; - case StateBeforeParamName: + case stateBeforeParamName: if (UTF8String[i] == ' ') last = i + 1; else { - state = StateParamName; + state = stateParamName; i--; } break; - case StateParamName: + case stateParamName: if (UTF8String[i] == '=') { name = [OFString stringWithUTF8String: UTF8String + last length: i - last]; - state = StateParamValueOrQuote; + state = stateParamValueOrQuote; last = i + 1; } break; - case StateParamValueOrQuote: + case stateParamValueOrQuote: if (UTF8String[i] == '"') { - state = StateParamQuotedValue; + state = stateParamQuotedValue; last = i + 1; } else { - state = StateParamValue; + state = stateParamValue; i--; } break; - case StateParamValue: + case stateParamValue: if (UTF8String[i] == ';') { value = [OFString stringWithUTF8String: UTF8String + last length: i - last]; value = @@ -178,36 +178,36 @@ value.stringByDeletingTrailingWhitespaces; if ([name isEqual: @"charset"]) charset = value; - state = StateBeforeParamName; + state = stateBeforeParamName; last = i + 1; } break; - case StateParamQuotedValue: + case stateParamQuotedValue: if (UTF8String[i] == '"') { value = [OFString stringWithUTF8String: UTF8String + last length: i - last]; if ([name isEqual: @"charset"]) charset = value; - state = StateAfterParamValue; + state = stateAfterParamValue; } break; - case StateAfterParamValue: + case stateAfterParamValue: if (UTF8String[i] == ';') { - state = StateBeforeParamName; + state = stateBeforeParamName; last = i + 1; } else if (UTF8String[i] != ' ') return OFStringEncodingAutodetect; break; } } - if (state == StateParamValue) { + if (state == stateParamValue) { value = [OFString stringWithUTF8String: UTF8String + last length: length - last]; value = value.stringByDeletingTrailingWhitespaces; if ([name isEqual: @"charset"]) Index: src/OFHTTPServer.m ================================================================== --- src/OFHTTPServer.m +++ src/OFHTTPServer.m @@ -72,13 +72,13 @@ @public OFStreamSocket *_socket; OFHTTPServer *_server; OFTimer *_timer; enum { - StateAwaitingProlog, - StateParsingHeaders, - StateSendResponse + stateAwaitingProlog, + stateParsingHeaders, + stateSendResponse } _state; uint8_t _HTTPMinorVersion; OFHTTPRequestMethod _method; OFString *_host, *_path; uint16_t _port; @@ -288,11 +288,11 @@ scheduledTimerWithTimeInterval: 10 target: _socket selector: @selector( cancelAsyncRequests) repeats: false] retain]; - _state = StateAwaitingProlog; + _state = stateAwaitingProlog; } @catch (id e) { [self release]; @throw e; } @@ -322,13 +322,13 @@ if (line == nil || exception != nil) return false; @try { switch (_state) { - case StateAwaitingProlog: + case stateAwaitingProlog: return [self parseProlog: line]; - case StateParsingHeaders: + case stateParsingHeaders: return [self parseHeaders: line]; default: return false; } } @catch (OFWriteFailedException *e) { @@ -387,11 +387,11 @@ if (![path hasPrefix: @"/"]) return [self sendErrorAndClose: 400]; _headers = [[OFMutableDictionary alloc] init]; _path = [path copy]; - _state = StateParsingHeaders; + _state = stateParsingHeaders; return true; } - (bool)parseHeaders: (OFString *)line @@ -429,11 +429,11 @@ [_timer invalidate]; [_timer release]; _timer = nil; } - _state = StateSendResponse; + _state = stateSendResponse; [self createResponse]; return false; } Index: src/OFInflateStream.m ================================================================== --- src/OFInflateStream.m +++ src/OFInflateStream.m @@ -38,24 +38,24 @@ #else # define bufferSize OFInflate64StreamBufferSize #endif enum State { - StateBlockHeader, - StateUncompressedBlockHeader, - StateUncompressedBlock, - StateHuffmanTree, - StateHuffmanBlock + stateBlockHeader, + stateUncompressedBlockHeader, + stateUncompressedBlock, + stateHuffmanTree, + stateHuffmanBlock }; enum HuffmanState { - HuffmanStateWriteValue, - HuffmanStateAwaitCode, - HuffmanStateAwaitLengthExtraBits, - HuffmanStateAwaitDistance, - HuffmanStateAwaitDistanceExtraBits, - HuffmanStateProcessPair + huffmanStateWriteValue, + huffmanStateAwaitCode, + huffmanStateAwaitLengthExtraBits, + huffmanStateAwaitDistance, + huffmanStateAwaitDistanceExtraBits, + huffmanStateProcessPair }; #ifndef OF_INFLATE64_STREAM_M static const uint8_t numDistanceCodes = 30; static const uint8_t lengthCodes[29] = { @@ -207,18 +207,18 @@ if (_stream != nil) [self close]; OFFreeMemory(_slidingWindow); - if (_state == StateHuffmanTree) { + if (_state == stateHuffmanTree) { OFFreeMemory(_context.huffmanTree.lengths); if (_context.huffmanTree.codeLenTree != NULL) OFHuffmanTreeFree(_context.huffmanTree.codeLenTree); } - if (_state == StateHuffmanTree || _state == StateHuffmanBlock) { + if (_state == stateHuffmanTree || _state == stateHuffmanBlock) { if (_context.huffman.litLenTree != fixedLitLenTree) OFHuffmanTreeFree(_context.huffman.litLenTree); if (_context.huffman.distTree != fixedDistTree) OFHuffmanTreeFree(_context.huffman.distTree); } @@ -241,11 +241,11 @@ if (_atEndOfStream) return 0; start: switch ((enum State)_state) { - case StateBlockHeader: + case stateBlockHeader: if OF_UNLIKELY (_inLastBlock) { [_stream unreadFromBuffer: _buffer + _bufferIndex length: _bufferLength - _bufferIndex]; _bufferIndex = _bufferLength = 0; @@ -259,24 +259,24 @@ _inLastBlock = (bits & 1); switch (bits >> 1) { case 0: /* No compression */ - _state = StateUncompressedBlockHeader; + _state = stateUncompressedBlockHeader; _bitIndex = 8; _context.uncompressedHeader.position = 0; memset(_context.uncompressedHeader.length, 0, 4); break; case 1: /* Fixed Huffman */ - _state = StateHuffmanBlock; - _context.huffman.state = HuffmanStateAwaitCode; + _state = stateHuffmanBlock; + _context.huffman.state = huffmanStateAwaitCode; _context.huffman.litLenTree = fixedLitLenTree; _context.huffman.distTree = fixedDistTree; _context.huffman.treeIter = fixedLitLenTree; break; case 2: /* Dynamic Huffman */ - _state = StateHuffmanTree; + _state = stateHuffmanTree; _context.huffmanTree.lengths = NULL; _context.huffmanTree.receivedCount = 0; _context.huffmanTree.value = 0xFE; _context.huffmanTree.litLenCodesCount = 0xFF; _context.huffmanTree.distCodesCount = 0xFF; @@ -285,11 +285,11 @@ default: @throw [OFInvalidFormatException exception]; } goto start; - case StateUncompressedBlockHeader: + case stateUncompressedBlockHeader: #define CTX _context.uncompressedHeader /* FIXME: This can be done more efficiently than unreading */ [_stream unreadFromBuffer: _buffer + _bufferIndex length: _bufferLength - _bufferIndex]; _bufferIndex = _bufferLength = 0; @@ -303,11 +303,11 @@ if OF_UNLIKELY ((CTX.length[0] | (CTX.length[1] << 8)) != (uint16_t)~(CTX.length[2] | (CTX.length[3] << 8))) @throw [OFInvalidFormatException exception]; - _state = StateUncompressedBlock; + _state = stateUncompressedBlock; /* * Do not reorder! _context.uncompressed.position and * _context.uncompressedHeader.length overlap! */ @@ -315,11 +315,11 @@ CTX.length[0] | (CTX.length[1] << 8); _context.uncompressed.position = 0; goto start; #undef CTX - case StateUncompressedBlock: + case stateUncompressedBlock: #define CTX _context.uncompressed if OF_UNLIKELY (length == 0) return bytesWritten; tmp = (length < (size_t)CTX.length - CTX.position @@ -341,15 +341,15 @@ length -= tmp; bytesWritten += tmp; CTX.position += tmp; if OF_UNLIKELY (CTX.position == CTX.length) - _state = StateBlockHeader; + _state = stateBlockHeader; goto start; #undef CTX - case StateHuffmanTree: + case stateHuffmanTree: #define CTX _context.huffmanTree if OF_LIKELY (CTX.value == 0xFE) { if OF_LIKELY (CTX.litLenCodesCount == 0xFF) { if OF_UNLIKELY (!tryReadBits(self, &bits, 5)) return bytesWritten; @@ -487,22 +487,22 @@ /* * litLenTree and distTree are at the same location in * _context.huffman and _context.huffmanTree, thus no need to * set them. */ - _state = StateHuffmanBlock; - _context.huffman.state = HuffmanStateAwaitCode; + _state = stateHuffmanBlock; + _context.huffman.state = huffmanStateAwaitCode; _context.huffman.treeIter = CTX.litLenTree; goto start; #undef CTX - case StateHuffmanBlock: + case stateHuffmanBlock: #define CTX _context.huffman for (;;) { uint8_t extraBits, lengthCodeIndex; - if OF_UNLIKELY (CTX.state == HuffmanStateWriteValue) { + if OF_UNLIKELY (CTX.state == huffmanStateWriteValue) { if OF_UNLIKELY (length == 0) return bytesWritten; buffer[bytesWritten++] = CTX.value; length--; @@ -510,28 +510,28 @@ _slidingWindow[_slidingWindowIndex] = CTX.value; _slidingWindowIndex = (_slidingWindowIndex + 1) & _slidingWindowMask; - CTX.state = HuffmanStateAwaitCode; + CTX.state = huffmanStateAwaitCode; CTX.treeIter = CTX.litLenTree; } if OF_UNLIKELY (CTX.state == - HuffmanStateAwaitLengthExtraBits) { + huffmanStateAwaitLengthExtraBits) { if OF_UNLIKELY (!tryReadBits(self, &bits, CTX.extraBits)) return bytesWritten; CTX.length += bits; - CTX.state = HuffmanStateAwaitDistance; + CTX.state = huffmanStateAwaitDistance; CTX.treeIter = CTX.distTree; } /* Distance of length distance pair */ - if (CTX.state == HuffmanStateAwaitDistance) { + if (CTX.state == huffmanStateAwaitDistance) { if OF_UNLIKELY (!OFHuffmanTreeWalk(self, tryReadBits, &CTX.treeIter, &value)) return bytesWritten; if OF_UNLIKELY (value >= numDistanceCodes) @@ -542,34 +542,34 @@ extraBits = distanceExtraBits[value]; if (extraBits > 0) { if OF_UNLIKELY (!tryReadBits(self, &bits, extraBits)) { -#define HSADEB HuffmanStateAwaitDistanceExtraBits +#define HSADEB huffmanStateAwaitDistanceExtraBits CTX.state = HSADEB; #undef HSADEB CTX.extraBits = extraBits; return bytesWritten; } CTX.distance += bits; } - CTX.state = HuffmanStateProcessPair; + CTX.state = huffmanStateProcessPair; } else if (CTX.state == - HuffmanStateAwaitDistanceExtraBits) { + huffmanStateAwaitDistanceExtraBits) { if OF_UNLIKELY (!tryReadBits(self, &bits, CTX.extraBits)) return bytesWritten; CTX.distance += bits; - CTX.state = HuffmanStateProcessPair; + CTX.state = huffmanStateProcessPair; } /* Length distance pair */ - if (CTX.state == HuffmanStateProcessPair) { + if (CTX.state == huffmanStateProcessPair) { for (uint_fast16_t j = 0; j < CTX.length; j++) { uint16_t idx; if OF_UNLIKELY (length == 0) { CTX.length -= j; @@ -588,11 +588,11 @@ _slidingWindowIndex = (_slidingWindowIndex + 1) & _slidingWindowMask; } - CTX.state = HuffmanStateAwaitCode; + CTX.state = huffmanStateAwaitCode; CTX.treeIter = CTX.litLenTree; } if OF_UNLIKELY (!OFHuffmanTreeWalk(self, tryReadBits, &CTX.treeIter, &value)) @@ -603,18 +603,18 @@ if (CTX.litLenTree != fixedLitLenTree) OFHuffmanTreeFree(CTX.litLenTree); if (CTX.distTree != fixedDistTree) OFHuffmanTreeFree(CTX.distTree); - _state = StateBlockHeader; + _state = stateBlockHeader; goto start; } /* Literal byte */ if OF_LIKELY (value < 256) { if OF_UNLIKELY (length == 0) { - CTX.state = HuffmanStateWriteValue; + CTX.state = huffmanStateWriteValue; CTX.value = value; return bytesWritten; } buffer[bytesWritten++] = value; @@ -640,19 +640,19 @@ if (extraBits > 0) { if OF_UNLIKELY (!tryReadBits(self, &bits, extraBits)) { CTX.extraBits = extraBits; CTX.state = - HuffmanStateAwaitLengthExtraBits; + huffmanStateAwaitLengthExtraBits; return bytesWritten; } CTX.length += bits; } CTX.treeIter = CTX.distTree; - CTX.state = HuffmanStateAwaitDistance; + CTX.state = huffmanStateAwaitDistance; } break; #undef CTX } Index: src/OFLHADecompressingStream.m ================================================================== --- src/OFLHADecompressingStream.m +++ src/OFLHADecompressingStream.m @@ -23,25 +23,25 @@ #import "OFHuffmanTree.h" #import "OFInvalidFormatException.h" #import "OFNotOpenException.h" -enum state { - StateBlockHeader, - StateCodeLenCodesCount, - StateCodeLenTree, - StateCodeLenTreeSingle, - StateLitLenCodesCount, - StateLitLenTree, - StateLitLenTreeSingle, - StateDistCodesCount, - StateDistTree, - StateDistTreeSingle, - StateBlockLitLen, - StateBlockDistLength, - StateBlockDistLengthExtra, - StateBlockLenDistPair +enum State { + stateBlockHeader, + stateCodeLenCodesCount, + stateCodeLenTree, + stateCodeLenTreeSingle, + stateLitLenCodesCount, + stateLitLenTree, + stateLitLenTreeSingle, + stateDistCodesCount, + stateDistTree, + stateDistTreeSingle, + stateBlockLitLen, + stateBlockDistLength, + stateBlockDistLengthExtra, + stateBlockLenDistPair }; @implementation OFLHADecompressingStream @synthesize bytesConsumed = _bytesConsumed; @@ -146,43 +146,43 @@ if (_stream == nil) @throw [OFNotOpenException exceptionWithObject: self]; if (_stream.atEndOfStream && _bufferLength - _bufferIndex == 0 && - _state == StateBlockHeader) + _state == stateBlockHeader) return 0; start: - switch ((enum state)_state) { - case StateBlockHeader: + switch ((enum State)_state) { + case stateBlockHeader: if OF_UNLIKELY (!tryReadBits(self, &bits, 16)) return bytesWritten; _symbolsLeft = bits; - _state = StateCodeLenCodesCount; + _state = stateCodeLenCodesCount; goto start; - case StateCodeLenCodesCount: + case stateCodeLenCodesCount: if OF_UNLIKELY (!tryReadBits(self, &bits, 5)) return bytesWritten; if OF_UNLIKELY (bits > 20) @throw [OFInvalidFormatException exception]; if OF_UNLIKELY (bits == 0) { - _state = StateCodeLenTreeSingle; + _state = stateCodeLenTreeSingle; goto start; } _codesCount = bits; _codesReceived = 0; _codesLengths = OFAllocZeroedMemory(bits, 1); _skip = true; - _state = StateCodeLenTree; + _state = stateCodeLenTree; goto start; - case StateCodeLenTree: + case stateCodeLenTree: while (_codesReceived < _codesCount) { if OF_UNLIKELY (_currentIsExtendedLength) { if OF_UNLIKELY (!tryReadBits(self, &bits, 1)) return bytesWritten; @@ -226,21 +226,21 @@ _codeLenTree = OFHuffmanTreeNew(_codesLengths, _codesCount); OFFreeMemory(_codesLengths); _codesLengths = NULL; - _state = StateLitLenCodesCount; + _state = stateLitLenCodesCount; goto start; - case StateCodeLenTreeSingle: + case stateCodeLenTreeSingle: if OF_UNLIKELY (!tryReadBits(self, &bits, 5)) return bytesWritten; _codeLenTree = OFHuffmanTreeNewSingle(bits); - _state = StateLitLenCodesCount; + _state = stateLitLenCodesCount; goto start; - case StateLitLenCodesCount: + case stateLitLenCodesCount: if OF_UNLIKELY (!tryReadBits(self, &bits, 9)) return bytesWritten; if OF_UNLIKELY (bits > 510) @throw [OFInvalidFormatException exception]; @@ -247,23 +247,23 @@ if OF_UNLIKELY (bits == 0) { OFHuffmanTreeFree(_codeLenTree); _codeLenTree = NULL; - _state = StateLitLenTreeSingle; + _state = stateLitLenTreeSingle; goto start; } _codesCount = bits; _codesReceived = 0; _codesLengths = OFAllocZeroedMemory(bits, 1); _skip = false; _treeIter = _codeLenTree; - _state = StateLitLenTree; + _state = stateLitLenTree; goto start; - case StateLitLenTree: + case stateLitLenTree: while (_codesReceived < _codesCount) { if OF_UNLIKELY (_skip) { uint16_t skipCount; switch (_codesLengths[_codesReceived]) { @@ -318,40 +318,40 @@ _codesLengths = NULL; OFHuffmanTreeFree(_codeLenTree); _codeLenTree = NULL; - _state = StateDistCodesCount; + _state = stateDistCodesCount; goto start; - case StateLitLenTreeSingle: + case stateLitLenTreeSingle: if OF_UNLIKELY (!tryReadBits(self, &bits, 9)) return bytesWritten; _litLenTree = OFHuffmanTreeNewSingle(bits); - _state = StateDistCodesCount; + _state = stateDistCodesCount; goto start; - case StateDistCodesCount: + case stateDistCodesCount: if OF_UNLIKELY (!tryReadBits(self, &bits, _distanceBits)) return bytesWritten; if OF_UNLIKELY (bits > _dictionaryBits) @throw [OFInvalidFormatException exception]; if OF_UNLIKELY (bits == 0) { - _state = StateDistTreeSingle; + _state = stateDistTreeSingle; goto start; } _codesCount = bits; _codesReceived = 0; _codesLengths = OFAllocZeroedMemory(bits, 1); _treeIter = _codeLenTree; - _state = StateDistTree; + _state = stateDistTree; goto start; - case StateDistTree: + case stateDistTree: while (_codesReceived < _codesCount) { if OF_UNLIKELY (_currentIsExtendedLength) { if OF_UNLIKELY (!tryReadBits(self, &bits, 1)) return bytesWritten; @@ -380,28 +380,28 @@ _distTree = OFHuffmanTreeNew(_codesLengths, _codesCount); OFFreeMemory(_codesLengths); _codesLengths = NULL; _treeIter = _litLenTree; - _state = StateBlockLitLen; + _state = stateBlockLitLen; goto start; - case StateDistTreeSingle: + case stateDistTreeSingle: if OF_UNLIKELY (!tryReadBits(self, &bits, _distanceBits)) return bytesWritten; _distTree = OFHuffmanTreeNewSingle(bits); _treeIter = _litLenTree; - _state = StateBlockLitLen; + _state = stateBlockLitLen; goto start; - case StateBlockLitLen: + case stateBlockLitLen: if OF_UNLIKELY (_symbolsLeft == 0) { OFHuffmanTreeFree(_litLenTree); OFHuffmanTreeFree(_distTree); _litLenTree = _distTree = NULL; - _state = StateBlockHeader; + _state = stateBlockHeader; /* * We must return here, as there is no indication * whether this was the last block. Whoever called this * method needs to check if everything has been read @@ -439,33 +439,33 @@ _symbolsLeft--; _treeIter = _litLenTree; } else { _length = value - 253; _treeIter = _distTree; - _state = StateBlockDistLength; + _state = stateBlockDistLength; } goto start; - case StateBlockDistLength: + case stateBlockDistLength: if OF_UNLIKELY (!OFHuffmanTreeWalk(self, tryReadBits, &_treeIter, &value)) return bytesWritten; _distance = value; _state = (value < 2 - ? StateBlockLenDistPair : StateBlockDistLengthExtra); + ? stateBlockLenDistPair : stateBlockDistLengthExtra); goto start; - case StateBlockDistLengthExtra: + case stateBlockDistLengthExtra: if OF_UNLIKELY (!tryReadBits(self, &bits, _distance - 1)) return bytesWritten; _distance = bits + (1u << (_distance - 1)); - _state = StateBlockLenDistPair; + _state = stateBlockLenDistPair; goto start; - case StateBlockLenDistPair: + case stateBlockLenDistPair: for (uint_fast16_t i = 0; i < _length; i++) { uint32_t idx; if OF_UNLIKELY (length == 0) { _length -= i; @@ -485,11 +485,11 @@ } _symbolsLeft--; _treeIter = _litLenTree; - _state = StateBlockLitLen; + _state = stateBlockLitLen; goto start; } OF_UNREACHABLE } @@ -498,11 +498,11 @@ { if (_stream == nil) @throw [OFNotOpenException exceptionWithObject: self]; return (_stream.atEndOfStream && - _bufferLength - _bufferIndex == 0 && _state == StateBlockHeader); + _bufferLength - _bufferIndex == 0 && _state == stateBlockHeader); } - (int)fileDescriptorForReading { return ((id )_stream) Index: src/OFMutableUTF8String.m ================================================================== --- src/OFMutableUTF8String.m +++ src/OFMutableUTF8String.m @@ -79,11 +79,11 @@ uint8_t t; const OFUnichar *const *table; assert(startTableSize >= 1 && middleTableSize >= 1); - _s->hashed = false; + _s->hasHash = false; for (i = 0; i < _s->cStringLength; i++) { if (isStart) table = startTable; else @@ -176,11 +176,11 @@ assert(j == newCStringLength); newCString[j] = 0; OFFreeMemory(unicodeString); OFFreeMemory(_s->cString); - _s->hashed = false; + _s->hasHash = false; _s->cString = newCString; _s->cStringLength = newCStringLength; /* * Even though cStringLength can change, length cannot, therefore no @@ -203,11 +203,11 @@ if (idx >= _s->cStringLength) @throw [OFOutOfRangeException exception]; /* Shortcut if old and new character both are ASCII */ if (character < 0x80 && !(_s->cString[idx] & 0x80)) { - _s->hashed = false; + _s->hasHash = false; _s->cString[idx] = character; return; } if ((lenNew = OFUTF8StringEncode(character, buffer)) == 0) @@ -215,11 +215,11 @@ if ((lenOld = OFUTF8StringDecode(_s->cString + idx, _s->cStringLength - idx, &c)) <= 0) @throw [OFInvalidEncodingException exception]; - _s->hashed = false; + _s->hasHash = false; if (lenNew == (size_t)lenOld) memcpy(_s->cString + idx, buffer, lenNew); else if (lenNew > (size_t)lenOld) { _s->cString = OFResizeMemory(_s->cString, @@ -273,11 +273,11 @@ break; case -1: @throw [OFInvalidEncodingException exception]; } - _s->hashed = false; + _s->hasHash = false; _s->cString = OFResizeMemory(_s->cString, _s->cStringLength + UTF8StringLength + 1, 1); memcpy(_s->cString + _s->cStringLength, UTF8String, UTF8StringLength + 1); @@ -302,11 +302,11 @@ break; case -1: @throw [OFInvalidEncodingException exception]; } - _s->hashed = false; + _s->hasHash = false; _s->cString = OFResizeMemory(_s->cString, _s->cStringLength + UTF8StringLength + 1, 1); memcpy(_s->cString + _s->cStringLength, UTF8String, UTF8StringLength); _s->cStringLength += UTF8StringLength; @@ -348,11 +348,11 @@ if (string == nil) @throw [OFInvalidArgumentException exception]; UTF8StringLength = string.UTF8StringLength; - _s->hashed = false; + _s->hasHash = false; _s->cString = OFResizeMemory(_s->cString, _s->cStringLength + UTF8StringLength + 1, 1); memcpy(_s->cString + _s->cStringLength, string.UTF8String, UTF8StringLength); @@ -389,11 +389,11 @@ j += len; } tmp[j] = '\0'; - _s->hashed = false; + _s->hasHash = false; _s->cString = OFResizeMemory(_s->cString, _s->cStringLength + j + 1, 1); memcpy(_s->cString + _s->cStringLength, tmp, j + 1); _s->cStringLength += j; @@ -427,11 +427,11 @@ - (void)reverse { size_t i, j; - _s->hashed = false; + _s->hasHash = false; /* We reverse all bytes and restore UTF-8 later, if necessary */ for (i = 0, j = _s->cStringLength - 1; i < _s->cStringLength / 2; i++, j--) { _s->cString[i] ^= _s->cString[j]; @@ -515,11 +515,11 @@ if (_s->isUTF8) idx = OFUTF8StringIndexToPosition(_s->cString, idx, _s->cStringLength); newCStringLength = _s->cStringLength + string.UTF8StringLength; - _s->hashed = false; + _s->hasHash = false; _s->cString = OFResizeMemory(_s->cString, newCStringLength + 1, 1); memmove(_s->cString + idx + string.UTF8StringLength, _s->cString + idx, _s->cStringLength - idx); memcpy(_s->cString + idx, string.UTF8String, @@ -552,11 +552,11 @@ _s->cStringLength); } memmove(_s->cString + start, _s->cString + end, _s->cStringLength - end); - _s->hashed = false; + _s->hasHash = false; _s->length -= range.length; _s->cStringLength -= end - start; _s->cString[_s->cStringLength] = 0; @try { @@ -589,11 +589,11 @@ _s->cStringLength); } newCStringLength = _s->cStringLength - (end - start) + replacement.UTF8StringLength; - _s->hashed = false; + _s->hasHash = false; /* * If the new string is bigger, we need to resize it first so we can * memmove() the rest of the string to the end. * @@ -700,11 +700,11 @@ _s->cStringLength - last); newCStringLength += _s->cStringLength - last; newCString[newCStringLength] = 0; OFFreeMemory(_s->cString); - _s->hashed = false; + _s->hasHash = false; _s->cString = newCString; _s->cStringLength = newCStringLength; _s->length = newLength; if ([replacement isKindOfClass: [OFUTF8String class]] || @@ -721,11 +721,11 @@ for (i = 0; i < _s->cStringLength; i++) if (!OFASCIIIsSpace(_s->cString[i])) break; - _s->hashed = false; + _s->hasHash = false; _s->cStringLength -= i; _s->length -= i; memmove(_s->cString, _s->cString + i, _s->cStringLength); _s->cString[_s->cStringLength] = '\0'; @@ -741,11 +741,11 @@ - (void)deleteTrailingWhitespaces { size_t d; char *p; - _s->hashed = false; + _s->hasHash = false; d = 0; for (p = _s->cString + _s->cStringLength - 1; p >= _s->cString; p--) { if (!OFASCIIIsSpace(*p)) break; @@ -768,11 +768,11 @@ - (void)deleteEnclosingWhitespaces { size_t d, i; char *p; - _s->hashed = false; + _s->hasHash = false; d = 0; for (p = _s->cString + _s->cStringLength - 1; p >= _s->cString; p--) { if (!OFASCIIIsSpace(*p)) break; Index: src/OFNumber.m ================================================================== --- src/OFNumber.m +++ src/OFNumber.m @@ -42,20 +42,20 @@ @interface OFNumberSingleton: OFNumber @end #ifdef OF_OBJFW_RUNTIME enum Tag { - TagChar, - TagShort, - TagInt, - TagLong, - TagLongLong, - TagUnsignedChar, - TagUnsignedShort, - TagUnsignedInt, - TagUnsignedLong, - TagUnsignedLongLong, + tagChar, + tagShort, + tagInt, + tagLong, + tagLongLong, + tagUnsignedChar, + tagUnsignedShort, + tagUnsignedInt, + tagUnsignedLong, + tagUnsignedLongLong, }; static const uint_fast8_t tagBits = 4; static const uintptr_t tagMask = 0xF; @interface OFTaggedPointerNumber: OFNumberSingleton @@ -172,11 +172,11 @@ OFOnce(&onceControl, charZeroNumberInit); return (id)charZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if ((unsigned char)value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)(unsigned char)value << tagBits) | TagChar); + ((uintptr_t)(unsigned char)value << tagBits) | tagChar); if (ret != nil) return ret; #endif } @@ -191,11 +191,11 @@ OFOnce(&onceControl, shortZeroNumberInit); return (id)shortZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if ((unsigned short)value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)(unsigned short)value << tagBits) | TagShort); + ((uintptr_t)(unsigned short)value << tagBits) | tagShort); if (ret != nil) return ret; #endif } @@ -210,11 +210,11 @@ OFOnce(&onceControl, intZeroNumberInit); return (id)intZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if ((unsigned int)value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)(unsigned int)value << tagBits) | TagInt); + ((uintptr_t)(unsigned int)value << tagBits) | tagInt); if (ret != nil) return ret; #endif } @@ -229,11 +229,11 @@ OFOnce(&onceControl, longZeroNumberInit); return (id)longZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if ((unsigned long)value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)(unsigned long)value << tagBits) | TagLong); + ((uintptr_t)(unsigned long)value << tagBits) | tagLong); if (ret != nil) return ret; #endif } @@ -249,11 +249,11 @@ return (id)longLongZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if ((unsigned long long)value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, ((uintptr_t)(unsigned long long)value << tagBits) | - TagLongLong); + tagLongLong); if (ret != nil) return ret; #endif } @@ -268,11 +268,11 @@ OFOnce(&onceControl, unsignedCharZeroNumberInit); return (id)unsignedCharZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if (value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)value << tagBits) | TagUnsignedChar); + ((uintptr_t)value << tagBits) | tagUnsignedChar); if (ret != nil) return ret; #endif } @@ -287,11 +287,11 @@ OFOnce(&onceControl, unsignedShortZeroNumberInit); return (id)unsignedShortZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if (value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)value << tagBits) | TagUnsignedShort); + ((uintptr_t)value << tagBits) | tagUnsignedShort); if (ret != nil) return ret; #endif } @@ -306,11 +306,11 @@ OFOnce(&onceControl, unsignedIntZeroNumberInit); return (id)unsignedIntZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if (value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)value << tagBits) | TagUnsignedInt); + ((uintptr_t)value << tagBits) | tagUnsignedInt); if (ret != nil) return ret; #endif } @@ -325,11 +325,11 @@ OFOnce(&onceControl, unsignedLongZeroNumberInit); return (id)unsignedLongZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if (value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)value << tagBits) | TagUnsignedLong); + ((uintptr_t)value << tagBits) | tagUnsignedLong); if (ret != nil) return ret; #endif } @@ -344,11 +344,11 @@ OFOnce(&onceControl, unsignedLongLongZeroNumberInit); return (id)unsignedLongLongZeroNumber; #ifdef OF_OBJFW_RUNTIME } else if (value <= (UINTPTR_MAX >> tagBits)) { id ret = objc_createTaggedPointer(numberTag, - ((uintptr_t)value << tagBits) | TagUnsignedLongLong); + ((uintptr_t)value << tagBits) | tagUnsignedLongLong); if (ret != nil) return ret; #endif } @@ -413,29 +413,29 @@ - (const char *)objCType { uintptr_t value = object_getTaggedPointerValue(self); switch (value & tagMask) { - case TagChar: + case tagChar: return @encode(signed char); - case TagShort: + case tagShort: return @encode(short); - case TagInt: + case tagInt: return @encode(int); - case TagLong: + case tagLong: return @encode(long); - case TagLongLong: + case tagLongLong: return @encode(long long); - case TagUnsignedChar: + case tagUnsignedChar: return @encode(unsigned char); - case TagUnsignedShort: + case tagUnsignedShort: return @encode(unsigned short); - case TagUnsignedInt: + case tagUnsignedInt: return @encode(unsigned int); - case TagUnsignedLong: + case tagUnsignedLong: return @encode(unsigned long); - case TagUnsignedLongLong: + case tagUnsignedLongLong: return @encode(unsigned long long); default: @throw [OFInvalidArgumentException exception]; } } @@ -442,29 +442,29 @@ # define RETURN_VALUE \ uintptr_t value = object_getTaggedPointerValue(self); \ \ switch (value & tagMask) { \ - case TagChar: \ + case tagChar: \ return (signed char)(unsigned char)(value >> tagBits); \ - case TagShort: \ + case tagShort: \ return (short)(unsigned short)(value >> tagBits); \ - case TagInt: \ + case tagInt: \ return (int)(unsigned int)(value >> tagBits); \ - case TagLong: \ + case tagLong: \ return (long)(unsigned long)(value >> tagBits); \ - case TagLongLong: \ + case tagLongLong: \ return (long long)(unsigned long long)(value >> tagBits); \ - case TagUnsignedChar: \ + case tagUnsignedChar: \ return (unsigned char)(value >> tagBits); \ - case TagUnsignedShort: \ + case tagUnsignedShort: \ return (unsigned short)(value >> tagBits); \ - case TagUnsignedInt: \ + case tagUnsignedInt: \ return (unsigned int)(value >> tagBits); \ - case TagUnsignedLong: \ + case tagUnsignedLong: \ return (unsigned long)(value >> tagBits); \ - case TagUnsignedLongLong: \ + case tagUnsignedLongLong: \ return (unsigned long long)(value >> tagBits); \ default: \ @throw [OFInvalidArgumentException exception]; \ } - (long long)longLongValue Index: src/OFStrPTime.m ================================================================== --- src/OFStrPTime.m +++ src/OFStrPTime.m @@ -23,13 +23,13 @@ const char * OFStrPTime(const char *buffer, const char *format, struct tm *tm, short *tz) { enum { - StateSearchConversionSpecifier, - StateInConversionSpecifier - } state = StateSearchConversionSpecifier; + stateSearchConversionSpecifier, + stateInConversionSpecifier + } state = stateSearchConversionSpecifier; size_t j, bufferLen, formatLen; bufferLen = strlen(buffer); formatLen = strlen(format); @@ -37,19 +37,18 @@ for (size_t i = 0; i < formatLen; i++) { if (j >= bufferLen) return NULL; switch (state) { - case StateSearchConversionSpecifier: + case stateSearchConversionSpecifier: if (format[i] == '%') - state = StateInConversionSpecifier; + state = stateInConversionSpecifier; else if (format[i] != buffer[j++]) return NULL; break; - - case StateInConversionSpecifier:; + case stateInConversionSpecifier:; int k, maxLen, number = 0; switch (format[i]) { case 'd': case 'e': @@ -219,13 +218,13 @@ if (buffer[j++] != '\t') return NULL; break; } - state = StateSearchConversionSpecifier; + state = stateSearchConversionSpecifier; break; } } return buffer + j; } Index: src/OFUTF8String.h ================================================================== --- src/OFUTF8String.h +++ src/OFUTF8String.h @@ -29,11 +29,11 @@ struct OFUTF8StringIvars { char *cString; size_t cStringLength; bool isUTF8; size_t length; - bool hashed; + bool hasHash; unsigned long hash; bool freeWhenDone; } *restrict _s; struct OFUTF8StringIvars _storage; } Index: src/OFUTF8String.m ================================================================== --- src/OFUTF8String.m +++ src/OFUTF8String.m @@ -789,11 +789,11 @@ string.length != _s->length) return false; if (([string isKindOfClass: [OFUTF8String class]] || [string isKindOfClass: [OFMutableUTF8String class]]) && - _s->hashed && string->_s->hashed && _s->hash != string->_s->hash) + _s->hasHash && string->_s->hasHash && _s->hash != string->_s->hash) return false; if (strcmp(_s->cString, string.UTF8String) != 0) return false; @@ -917,11 +917,11 @@ - (unsigned long)hash { unsigned long hash; - if (_s->hashed) + if (_s->hasHash) return _s->hash; OFHashInit(&hash); for (size_t i = 0; i < _s->cStringLength; i++) { @@ -940,11 +940,11 @@ } OFHashFinalize(&hash); _s->hash = hash; - _s->hashed = true; + _s->hasHash = true; return hash; } - (OFUnichar)characterAtIndex: (size_t)idx Index: utils/ofhttp/OFHTTP.m ================================================================== --- utils/ofhttp/OFHTTP.m +++ utils/ofhttp/OFHTTP.m @@ -130,18 +130,18 @@ { void *pool; const char *UTF8String; size_t UTF8StringLength; enum { - StateDispositionType, - StateDispositionTypeSemicolon, - StateDispositionParamNameSkipSpace, - StateDispositionParamName, - StateDispositionParamValue, - StateDispositionParamQuoted, - StateDispositionParamUnquoted, - StateDispositionExpectSemicolon + stateDispositionType, + stateDispositionTypeSemicolon, + stateDispositionParamNameSkipSpace, + stateDispositionParamName, + stateDispositionParamValue, + stateDispositionParamQuoted, + stateDispositionParamUnquoted, + stateDispositionExpectSemicolon } state; size_t last; OFString *type = nil, *paramName = nil, *paramValue; OFMutableDictionary *params; OFString *fileName; @@ -151,76 +151,76 @@ pool = objc_autoreleasePoolPush(); UTF8String = contentDisposition.UTF8String; UTF8StringLength = contentDisposition.UTF8StringLength; - state = StateDispositionType; + state = stateDispositionType; params = [OFMutableDictionary dictionary]; last = 0; for (size_t i = 0; i < UTF8StringLength; i++) { switch (state) { - case StateDispositionType: + case stateDispositionType: if (UTF8String[i] == ';' || UTF8String[i] == ' ') { type = [OFString stringWithUTF8String: UTF8String length: i]; state = (UTF8String[i] == ';' - ? StateDispositionParamNameSkipSpace - : StateDispositionTypeSemicolon); + ? stateDispositionParamNameSkipSpace + : stateDispositionTypeSemicolon); last = i + 1; } break; - case StateDispositionTypeSemicolon: + case stateDispositionTypeSemicolon: if (UTF8String[i] == ';') { - state = StateDispositionParamNameSkipSpace; + state = stateDispositionParamNameSkipSpace; last = i + 1; } else if (UTF8String[i] != ' ') { objc_autoreleasePoolPop(pool); return nil; } break; - case StateDispositionParamNameSkipSpace: + case stateDispositionParamNameSkipSpace: if (UTF8String[i] != ' ') { - state = StateDispositionParamName; + state = stateDispositionParamName; last = i; i--; } break; - case StateDispositionParamName: + case stateDispositionParamName: if (UTF8String[i] == '=') { paramName = [OFString stringWithUTF8String: UTF8String + last length: i - last]; - state = StateDispositionParamValue; + state = stateDispositionParamValue; } break; - case StateDispositionParamValue: + case stateDispositionParamValue: if (UTF8String[i] == '"') { - state = StateDispositionParamQuoted; + state = stateDispositionParamQuoted; last = i + 1; } else { - state = StateDispositionParamUnquoted; + state = stateDispositionParamUnquoted; last = i; i--; } break; - case StateDispositionParamQuoted: + case stateDispositionParamQuoted: if (UTF8String[i] == '"') { paramValue = [OFString stringWithUTF8String: UTF8String + last length: i - last]; [params setObject: paramValue forKey: paramName.lowercaseString]; - state = StateDispositionExpectSemicolon; + state = stateDispositionExpectSemicolon; } break; - case StateDispositionParamUnquoted: + case stateDispositionParamUnquoted: if (UTF8String[i] <= 31 || UTF8String[i] >= 127) return nil; switch (UTF8String[i]) { case ' ': case '"': case '(': case ')': case ',': @@ -234,34 +234,34 @@ length: i - last]; [params setObject: paramValue forKey: paramName.lowercaseString]; - state = StateDispositionParamNameSkipSpace; + state = stateDispositionParamNameSkipSpace; break; } break; - case StateDispositionExpectSemicolon: + case stateDispositionExpectSemicolon: if (UTF8String[i] == ';') { - state = StateDispositionParamNameSkipSpace; + state = stateDispositionParamNameSkipSpace; last = i + 1; } else if (UTF8String[i] != ' ') { objc_autoreleasePoolPop(pool); return nil; } break; } } - if (state == StateDispositionParamUnquoted) { + if (state == stateDispositionParamUnquoted) { paramValue = [OFString stringWithUTF8String: UTF8String + last length: UTF8StringLength - last]; [params setObject: paramValue forKey: paramName.lowercaseString]; - } else if (state != StateDispositionExpectSemicolon) { + } else if (state != stateDispositionExpectSemicolon) { objc_autoreleasePoolPop(pool); return nil; } if (![type isEqual: @"attachment"] ||