cvs: php4 /ext/pcre php_pcre.c

andrei Fri Jun 30 12:40:42 2000 EDT Modified files: /php4/ext/pcre php_pcre.c Log: Typo. Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.61 php4/ext/pcre/php_pcre.c:1.62 --- php4/ext/pcre/php_pcre.c:1.61 Wed Jun 28 13:07:25 2000 +++ php4/ext/pcre/php_pcre.c Fri Jun 30 12:40:42 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.61 2000/06/28 20:07:25 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.62 2000/06/30 19:40:42 andrei Exp $ */ /* TODO: @@ -417,7 +417,7 @@ matched++; match = (*subject)->value.str.val + offsets[0]; - /* If subpatters array has been passed, fill it in with values. */ + /* If subpatterns array has been passed, fill it in with values. */ if (subpats != NULL) { /* Try to get the list of substrings and display a warning if failed. */ if (pcre_get_substring_list((*subject)->value.str.val, @@ -716,6 +716,9 @@ *walkbuf = '\0'; /* increment the result length by how much we've added to the string */ *result_len += walkbuf - (result + *result_len); + + if (limit != -1) + limit--; } } else { /* Failed to match */ /* If we previously set PCRE_NOTEMPTY after a null match, @@ -752,9 +755,6 @@ /* Advance to the next piece. */ start_offset = offsets[1]; - - if (limit != -1) - limit--; } efree(offsets);