--- fsl.c 2002/08/02 10:56:22 1.47
+++ fsl.c 2002/08/02 11:00:23 1.48
@@ -430,7 +430,6 @@
l2_result_t l2rv;
int matchcount = 0;
pcre *pcreRegex = NULL;
- pcre_extra *pcreExtra = NULL;
const char *cpError;
int iError;
int nMatch;
@@ -528,11 +527,8 @@
/* compile regular expression into finite state machine and optimize */
if ((pcreRegex = pcre_compile(argmatch, PCRE_ANCHORED|PCRE_CASELESS, &cpError, &iError, NULL)) == NULL) {
fsldebug(L2_LEVEL_ERROR, "processcfg: pcre_compile() failed with error %s (%d)", cpError, iError); CU(FSL_ERR_CUS); }
- pcreExtra = pcre_study(pcreRegex, 0, &cpError);
- if (cpError != NULL) {
- fsldebug(L2_LEVEL_ERROR, "processcfg: pcre_study() failed with error %s", cpError); CU(FSL_ERR_CUS); }
- nMatch = pcre_exec(pcreRegex, pcreExtra, cpISF, strlen(cpISF), 0, 0, ovec, OVECSIZE);
+ nMatch = pcre_exec(pcreRegex, NULL, cpISF, strlen(cpISF), 0, 0, ovec, OVECSIZE);
if (nMatch < 0)
fsldebug(L2_LEVEL_TRACE, "processcfg: matching ident/facility \"%s\" against section \"%s\" failed.", cpISF, argmatch);
else
@@ -561,10 +557,6 @@
matchcount++;
free(argl2spec);
}
- if (pcreExtra != NULL) {
- pcre_free(pcreExtra);
- pcreExtra = NULL;
- }
if (pcreRegex != NULL) {
pcre_free(pcreRegex);
pcreRegex = NULL;
@@ -612,10 +604,6 @@
else
CU(FSL_OK);
CUS:
- if (pcreExtra != NULL) {
- pcre_free(pcreExtra);
- pcreExtra = NULL;
- }
if (pcreRegex != NULL) {
pcre_free(pcreRegex);
pcreRegex = NULL;
|
