CVS update: php3/functions
| From: | andrey | Date: | Mon, 21 Jun 1999 22:12:21 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7349@lists.php.net to get a copy of this message | ||
Date: Monday June 21, 1999 @ 18:12
Author: andrey
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv23019/functions
Modified Files:
reg.c
Log Message:
Backing out the changes.
Index: php3/functions/reg.c
diff -u php3/functions/reg.c:1.102 php3/functions/reg.c:1.103
--- php3/functions/reg.c:1.102 Mon Jun 7 13:25:00 1999
+++ php3/functions/reg.c Mon Jun 21 18:12:21 1999
@@ -28,7 +28,7 @@
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
-/* $Id: reg.c,v 1.102 1999/06/07 17:25:00 andrey Exp $ */
+/* $Id: reg.c,v 1.103 1999/06/21 22:12:21 andrey Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -541,7 +541,7 @@
}
/* churn through str, generating array entries as we go */
- while ((count == -1 || count > 0) && !(err = regexec(&re, strp, 1, subs, 0))) {
+ while ((count == -1 || count > 1) && !(err = regexec(&re, strp, 1, subs, 0))) {
if (subs[0].rm_so == 0 && subs[0].rm_eo) {
/* match is at start of string, return empty string */
add_next_index_stringl(return_value, empty_string, 0, 1);
@@ -582,10 +582,8 @@
}
/* otherwise we just have one last element to add to the array */
- if (count != 0) {
- size = endp - strp;
- add_next_index_stringl(return_value, strp, size, 1);
- }
+ size = endp - strp;
+ add_next_index_stringl(return_value, strp, size, 1);
_php3_regfree(&re);