@@ -35,11 +35,11 @@ if (isa == [OFStream class]) @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; cache = NULL; - wbuffer = NULL; + wBuffer = NULL; return self; } - (BOOL)_atEndOfStream @@ -75,28 +75,28 @@ { if (cache == NULL) return [self _readNBytes: size intoBuffer: buf]; - if (size >= cache_len) { - size_t ret = cache_len; - memcpy(buf, cache, cache_len); + if (size >= cacheLen) { + size_t ret = cacheLen; + memcpy(buf, cache, cacheLen); [self freeMemory: cache]; cache = NULL; - cache_len = 0; + cacheLen = 0; return ret; } else { - char *tmp = [self allocMemoryWithSize: cache_len - size]; - memcpy(tmp, cache + size, cache_len - size); + char *tmp = [self allocMemoryWithSize: cacheLen - size]; + memcpy(tmp, cache + size, cacheLen - size); memcpy(buf, cache, size); [self freeMemory: cache]; cache = tmp; - cache_len -= size; + cacheLen -= size; return size; } } @@ -238,11 +238,11 @@ char *ret_c, *tmp, *tmp2; OFString *ret; /* Look if there's a line or \0 in our cache */ if (cache != NULL) { - for (i = 0; i < cache_len; i++) { + for (i = 0; i < cacheLen; i++) { if (OF_UNLIKELY(cache[i] == '\n' || cache[i] == '\0')) { ret_len = i; if (i > 0 && cache[i - 1] == '\r') @@ -250,19 +250,19 @@ ret = [OFString stringWithCString: cache encoding: encoding length: ret_len]; - tmp = [self allocMemoryWithSize: cache_len - + tmp = [self allocMemoryWithSize: cacheLen - i - 1]; if (tmp != NULL) memcpy(tmp, cache + i + 1, - cache_len - i - 1); + cacheLen - i - 1); [self freeMemory: cache]; cache = tmp; - cache_len -= i + 1; + cacheLen -= i + 1; return ret; } } } @@ -274,11 +274,11 @@ for (;;) { if ([self _atEndOfStream]) { if (cache == NULL) return nil; - ret_len = cache_len; + ret_len = cacheLen; if (ret_len > 0 && cache[ret_len - 1] == '\r') ret_len--; ret = [OFString stringWithCString: cache @@ -285,11 +285,11 @@ encoding: encoding length: ret_len]; [self freeMemory: cache]; cache = NULL; - cache_len = 0; + cacheLen = 0; return ret; } len = [self _readNBytes: of_pagesize @@ -297,17 +297,17 @@ /* Look if there's a newline or \0 */ for (i = 0; i < len; i++) { if (OF_UNLIKELY(tmp[i] == '\n' || tmp[i] == '\0')) { - ret_len = cache_len + i; + ret_len = cacheLen + i; ret_c = [self allocMemoryWithSize: ret_len]; if (cache != NULL) - memcpy(ret_c, cache, cache_len); - memcpy(ret_c + cache_len, tmp, i); + memcpy(ret_c, cache, cacheLen); + memcpy(ret_c + cacheLen, tmp, i); if (ret_len > 0 && ret_c[ret_len - 1] == '\r') ret_len--; @@ -326,28 +326,28 @@ memcpy(tmp2, tmp + i + 1, len - i - 1); [self freeMemory: cache]; cache = tmp2; - cache_len = len - i - 1; + cacheLen = len - i - 1; return ret; } } /* There was no newline or \0 */ cache = [self resizeMemory: cache - toSize: cache_len + len]; + toSize: cacheLen + len]; /* - * It's possible that cache_len + len is 0 and thus + * It's possible that cacheLen + len is 0 and thus * cache was set to NULL by resizeMemory:toSize:. */ if (cache != NULL) - memcpy(cache + cache_len, tmp, len); + memcpy(cache + cacheLen, tmp, len); - cache_len += len; + cacheLen += len; } } @finally { [self freeMemory: tmp]; } @@ -378,11 +378,11 @@ @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; /* Look if there's something in our cache */ if (cache != NULL) { - for (i = 0; i < cache_len; i++) { + for (i = 0; i < cacheLen; i++) { if (cache[i] != delim[j++]) j = 0; if (j == delim_len || cache[i] == '\0') { if (cache[i] == '\0') @@ -391,19 +391,19 @@ ret = [OFString stringWithCString: cache encoding: encoding length: i + 1 - delim_len]; - tmp = [self allocMemoryWithSize: cache_len - i - + tmp = [self allocMemoryWithSize: cacheLen - i - 1]; if (tmp != NULL) memcpy(tmp, cache + i + 1, - cache_len - i - 1); + cacheLen - i - 1); [self freeMemory: cache]; cache = tmp; - cache_len -= i + 1; + cacheLen -= i + 1; return ret; } } } @@ -417,15 +417,15 @@ if (cache == NULL) return nil; ret = [OFString stringWithCString: cache encoding: encoding - length: cache_len]; + length: cacheLen]; [self freeMemory: cache]; cache = NULL; - cache_len = 0; + cacheLen = 0; return ret; } len = [self _readNBytes: of_pagesize @@ -438,21 +438,21 @@ if (j == delim_len || tmp[i] == '\0') { if (tmp[i] == '\0') delim_len = 1; - ret_len = cache_len + i + 1 - delim_len; + ret_len = cacheLen + i + 1 - delim_len; ret_c = [self allocMemoryWithSize: ret_len]; if (cache != NULL && - cache_len <= ret_len) - memcpy(ret_c, cache, cache_len); + cacheLen <= ret_len) + memcpy(ret_c, cache, cacheLen); else if (cache != NULL) memcpy(ret_c, cache, ret_len); if (i >= delim_len) - memcpy(ret_c + cache_len, tmp, + memcpy(ret_c + cacheLen, tmp, i + 1 - delim_len); @try { ret = [OFString stringWithCString: ret_c @@ -468,28 +468,28 @@ memcpy(tmp2, tmp + i + 1, len - i - 1); [self freeMemory: cache]; cache = tmp2; - cache_len = len - i - 1; + cacheLen = len - i - 1; return ret; } } /* Neither the delimiter nor \0 was found */ cache = [self resizeMemory: cache - toSize: cache_len + len]; + toSize: cacheLen + len]; /* - * It's possible that cache_len + len is 0 and thus + * It's possible that cacheLen + len is 0 and thus * cache was set to NULL by resizeMemory:toSize:. */ if (cache != NULL) - memcpy(cache + cache_len, tmp, len); + memcpy(cache + cacheLen, tmp, len); - cache_len += len; + cacheLen += len; } } @finally { [self freeMemory: tmp]; } @@ -497,38 +497,38 @@ assert(0); } - (void)bufferWrites { - use_wbuffer = YES; + useWBuffer = YES; } - (void)flushWriteBuffer { - if (wbuffer == NULL) + if (wBuffer == NULL) return; - [self _writeNBytes: wbuffer_len - fromBuffer: wbuffer]; + [self _writeNBytes: wBufferLen + fromBuffer: wBuffer]; - [self freeMemory: wbuffer]; - wbuffer = NULL; - wbuffer_len = 0; - use_wbuffer = NO; + [self freeMemory: wBuffer]; + wBuffer = NULL; + wBufferLen = 0; + useWBuffer = NO; } - (size_t)writeNBytes: (size_t)size fromBuffer: (const char*)buf { - if (!use_wbuffer) + if (!useWBuffer) return [self _writeNBytes: size fromBuffer: buf]; else { - wbuffer = [self resizeMemory: wbuffer - toSize: wbuffer_len + size]; - memcpy(wbuffer + wbuffer_len, buf, size); - wbuffer_len += size; + wBuffer = [self resizeMemory: wBuffer + toSize: wBufferLen + size]; + memcpy(wBuffer + wBufferLen, buf, size); + wBufferLen += size; return size; } }