CVS update: php3/functions

Date: Thursday June 3, 1999 @ 10:15 Author: sas Update of /repository/php3/functions In directory php:/tmp/cvs-serv13773/functions Modified Files: dba_db2.c pcre.c Log Message: - db2 module did some frees too much - kill some warnings in pcre.c Index: php3/functions/dba_db2.c diff -u php3/functions/dba_db2.c:1.8 php3/functions/dba_db2.c:1.9 --- php3/functions/dba_db2.c:1.8 Wed May 12 13:54:26 1999 +++ php3/functions/dba_db2.c Thu Jun 3 10:15:28 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.8 1999/05/12 17:54:26 sas Exp $ */ +/* $Id: dba_db2.c,v 1.9 1999/06/03 14:15:28 sas Exp $ */ #include "php.h" @@ -110,7 +110,6 @@ if(!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) { if(newlen) *newlen = gval.size; new = estrndup(gval.data, gval.size); - free(gval.data); } return new; } @@ -140,7 +139,6 @@ memset(&gval, 0, sizeof(gval)); if(!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) { - if(gval.data) free(gval.data); return SUCCESS; } return FAILURE; @@ -188,9 +186,7 @@ if(gkey.data) { nkey = estrndup(gkey.data, gkey.size); if(newlen) *newlen = gkey.size; - free(gkey.data); } - if(gval.data) free(gval.data); } return nkey; } Index: php3/functions/pcre.c diff -u php3/functions/pcre.c:1.6 php3/functions/pcre.c:1.7 --- php3/functions/pcre.c:1.6 Sat May 29 17:28:56 1999 +++ php3/functions/pcre.c Thu Jun 3 10:15:28 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcre.c,v 1.6 1999/05/29 21:28:56 andrey Exp $ */ +/* $Id: pcre.c,v 1.7 1999/06/03 14:15:28 sas Exp $ */ #include "php.h" @@ -253,7 +253,7 @@ array for global match */ *result_set, /* Holds a set of subpatterns after a global match */ - **match_sets; /* An array of sets of matches for each + **match_sets = NULL; /* An array of sets of matches for each subpattern after a global match */ pcre *re = NULL; /* Compiled regular expression */ pcre_extra *extra = NULL; /* Holds results of studying */ @@ -264,7 +264,7 @@ int size_offsets; /* Size of the offsets array */ int matched; /* Has anything matched */ int i; - int subpats_order_val; /* Integer value of subpats_order */ + int subpats_order_val = 0; /* Integer value of subpats_order */ const char **stringlist; /* Used to hold list of subpatterns */ char *match, /* The current match */ *piece, /* The current piece of subject */