Index: generic/nsfUtil.c =================================================================== diff -u -r880487204ff2da18d2d25ebd727b9b4bbda86c8e -r6b1a83846ee9bd80b7ce10d88cc427bdb5585819 --- generic/nsfUtil.c (.../nsfUtil.c) (revision 880487204ff2da18d2d25ebd727b9b4bbda86c8e) +++ generic/nsfUtil.c (.../nsfUtil.c) (revision 6b1a83846ee9bd80b7ce10d88cc427bdb5585819) @@ -54,8 +54,8 @@ } needle_len = strlen(needle); - for (p = (char *)buffer, remainder = buffer_len; - p != NULL; + for (p = (char *)buffer, remainder = buffer_len; + p != NULL; p = memchr(p + 1, *needle, remainder-1)) { remainder = buffer_len - (p - buffer); if (remainder < needle_len) break; @@ -72,7 +72,7 @@ *---------------------------------------------------------------------- * Nsf_ltoa -- * - * Convert a long value into a string; this function is a fast + * Convert a long value into a string; this function is a fast * version of sprintf(buf, "%ld", l); * * Results: @@ -88,23 +88,23 @@ int nr_written, negative; char tmp[LONG_AS_STRING], *pointer = &tmp[1], *string, *p; *tmp = 0; - + if (i<0) { i = -i; negative = nr_written = 1; - } else + } else nr_written = negative = 0; - + do { nr_written++; *pointer++ = i%10 + '0'; i/=10; } while (i); - + p = string = buf; if (negative) *p++ = '-'; - + while ((*p++ = *--pointer)); /* copy number (reversed) from tmp to buf */ if (len) *len = nr_written; return string; @@ -140,7 +140,7 @@ currentChar = iss->buffer + iss->bufSize - 2; newch = *(alphabet + chartable[(unsigned)*currentChar]); - + while (1) { if (newch) { /* no overflow */ *currentChar = newch;