projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deal with double unlocks (which does happen sometimes)
[idzebra-moved-to-github.git]
/
recctrl
/
regxread.c
diff --git
a/recctrl/regxread.c
b/recctrl/regxread.c
index
4ec6a2c
..
c54e12a
100644
(file)
--- a/
recctrl/regxread.c
+++ b/
recctrl/regxread.c
@@
-1,4
+1,4
@@
-/* $Id: regxread.c,v 1.60 2006-04-26 11:12:31 adam Exp $
+/* $Id: regxread.c,v 1.62 2006-06-13 19:45:14 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-469,15
+469,20
@@
static int actionListMk (struct lexSpec *spec, const char *s,
r = dfa_parse ((*ap)->u.pattern.dfa, &s);
if (r || *s != '/')
{
r = dfa_parse ((*ap)->u.pattern.dfa, &s);
if (r || *s != '/')
{
+ int pos = s - s0;
xfree (*ap);
*ap = NULL;
xfree (*ap);
*ap = NULL;
- yaz_log (YLOG_WARN, "regular expression error '%.*s'", s-s0, s0);
+ yaz_log(YLOG_WARN, "regular expression error '%.*s'", pos, s0);
return -1;
}
return -1;
}
- if (debug_dfa_tran)
- printf ("pattern: %.*s\n", s-s0, s0);
- dfa_mkstate ((*ap)->u.pattern.dfa);
- s++;
+ else
+ {
+ int pos = s - s0;
+ if (debug_dfa_tran)
+ printf("pattern: %.*s\n", pos, s0);
+ dfa_mkstate((*ap)->u.pattern.dfa);
+ s++;
+ }
break;
case REGX_BEGIN:
yaz_log (YLOG_WARN, "cannot use BEGIN here");
break;
case REGX_BEGIN:
yaz_log (YLOG_WARN, "cannot use BEGIN here");
@@
-2013,3
+2018,11
@@
idzebra_filter
#endif
0,
};
#endif
0,
};
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+