diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-11-26 16:59:05 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-11-26 16:59:05 (GMT) |
| commit | e168187cdd79d76ce92d760218fe7bec7d3dcf32 (patch) | |
| tree | 47709505e4667682031ba33d50ca2512dd5a1c71 /generic/rege_dfa.c | |
| parent | 9ee1f42d143f766f9fafd3eb1d1ac354b15c681d (diff) | |
| parent | 888f7141151b5b085d0cdc0029121d67a06e7273 (diff) | |
| download | tcl-e168187cdd79d76ce92d760218fe7bec7d3dcf32.zip tcl-e168187cdd79d76ce92d760218fe7bec7d3dcf32.tar.gz tcl-e168187cdd79d76ce92d760218fe7bec7d3dcf32.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic/rege_dfa.c')
| -rw-r--r-- | generic/rege_dfa.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/rege_dfa.c b/generic/rege_dfa.c index c80996a..e233680 100644 --- a/generic/rege_dfa.c +++ b/generic/rege_dfa.c @@ -318,32 +318,32 @@ newdfa( struct vars *v, struct cnfa *cnfa, struct colormap *cm, - struct smalldfa *small) /* preallocated space, may be NULL */ + struct smalldfa *sml) /* preallocated space, may be NULL */ { struct dfa *d; size_t nss = cnfa->nstates * 2; int wordsper = (cnfa->nstates + UBITS - 1) / UBITS; - struct smalldfa *smallwas = small; + struct smalldfa *smallwas = sml; assert(cnfa != NULL && cnfa->nstates != 0); if (nss <= FEWSTATES && cnfa->ncolors <= FEWCOLORS) { assert(wordsper == 1); - if (small == NULL) { - small = (struct smalldfa *) MALLOC(sizeof(struct smalldfa)); - if (small == NULL) { + if (sml == NULL) { + sml = (struct smalldfa *) MALLOC(sizeof(struct smalldfa)); + if (sml == NULL) { ERR(REG_ESPACE); return NULL; } } - d = &small->dfa; - d->ssets = small->ssets; - d->statesarea = small->statesarea; + d = &sml->dfa; + d->ssets = sml->ssets; + d->statesarea = sml->statesarea; d->work = &d->statesarea[nss]; - d->outsarea = small->outsarea; - d->incarea = small->incarea; + d->outsarea = sml->outsarea; + d->incarea = sml->incarea; d->cptsmalloced = 0; - d->mallocarea = (smallwas == NULL) ? (char *)small : NULL; + d->mallocarea = (smallwas == NULL) ? (char *)sml : NULL; } else { d = (struct dfa *)MALLOC(sizeof(struct dfa)); if (d == NULL) { @@ -388,7 +388,7 @@ newdfa( /* - freedfa - free a DFA - ^ static VOID freedfa(struct dfa *); + ^ static void freedfa(struct dfa *); */ static void freedfa( |