Index: generic/nsfUtil.c =================================================================== diff -u -N -r7c9627dd582ea07050a95a6e0bb05cdf381fe592 -r9238ec9d4886db0f3c2c903cb19042aaca35b31f --- generic/nsfUtil.c (.../nsfUtil.c) (revision 7c9627dd582ea07050a95a6e0bb05cdf381fe592) +++ generic/nsfUtil.c (.../nsfUtil.c) (revision 9238ec9d4886db0f3c2c903cb19042aaca35b31f) @@ -66,15 +66,15 @@ needle_len = strlen(needle); for (p = (char *)buffer, remainder = buffer_len; - p != NULL; - p = memchr(p + 1, *needle, remainder-1)) { + p != NULL; + p = memchr(p + 1, *needle, remainder-1)) { remainder = buffer_len - (size_t)(p - buffer); if (remainder < needle_len) { - break; + break; } if (strncmp(p, needle, needle_len) == 0) { - result = p; - break; + result = p; + break; } } } @@ -176,22 +176,22 @@ newch = *(alphabet + chartable[(unsigned)*currentChar]); if (currentChar < iss->start) { - iss->length++; - if (currentChar == iss->buffer) { - size_t newBufSize = iss->bufSize + blockIncrement; - char *newBuffer = ckalloc(newBufSize); + iss->length++; + if (currentChar == iss->buffer) { + size_t newBufSize = iss->bufSize + blockIncrement; + char *newBuffer = ckalloc(newBufSize); - currentChar = newBuffer+blockIncrement; - /*memset(newBuffer, 0, blockIncrement);*/ - memcpy(currentChar, iss->buffer, iss->bufSize); - *currentChar = newch; - iss->start = currentChar; - ckfree(iss->buffer); - iss->buffer = newBuffer; - iss->bufSize = newBufSize; - } else { - iss->start = currentChar; - } + currentChar = newBuffer+blockIncrement; + /*memset(newBuffer, 0, blockIncrement);*/ + memcpy(currentChar, iss->buffer, iss->bufSize); + *currentChar = newch; + iss->start = currentChar; + ckfree(iss->buffer); + iss->buffer = newBuffer; + iss->bufSize = newBufSize; + } else { + iss->start = currentChar; + } } } }