diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-14 07:04:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-14 07:04:09 (GMT) |
| commit | be3995f91a73707ad23aa2454b143f6ee0301005 (patch) | |
| tree | 2a7de20e57494b77dec01639bf2a871d9573a514 /generic | |
| parent | e05045246f6a09ad6c214cd7045e431e7c07a9fd (diff) | |
| parent | c9376306301e578615cfee52d2121f78cb31a225 (diff) | |
| download | tcl-be3995f91a73707ad23aa2454b143f6ee0301005.zip tcl-be3995f91a73707ad23aa2454b143f6ee0301005.tar.gz tcl-be3995f91a73707ad23aa2454b143f6ee0301005.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/regcomp.c | 2 | ||||
| -rw-r--r-- | generic/regexec.c | 3 | ||||
| -rw-r--r-- | generic/tclDate.c | 10 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 10 | ||||
| -rw-r--r-- | generic/tclTrace.c | 2 |
5 files changed, 13 insertions, 14 deletions
diff --git a/generic/regcomp.c b/generic/regcomp.c index 9bf862c..1098d4e 100644 --- a/generic/regcomp.c +++ b/generic/regcomp.c @@ -511,7 +511,7 @@ freev( struct vars *v, int err) { - register int ret; + int ret; if (v->re != NULL) { rfree(v->re); diff --git a/generic/regexec.c b/generic/regexec.c index f243968..2c056e1 100644 --- a/generic/regexec.c +++ b/generic/regexec.c @@ -91,7 +91,6 @@ struct smalldfa { struct sset *outsarea[FEWSTATES*2 * FEWCOLORS]; struct arcp incarea[FEWSTATES*2 * FEWCOLORS]; }; -#define DOMALLOC ((struct smalldfa *)NULL) /* force malloc */ /* * Internal variables, bundled for easy passing around. @@ -295,7 +294,7 @@ getsubdfa(struct vars * v, struct subre * t) { if (v->subdfas[t->id] == NULL) { - v->subdfas[t->id] = newDFA(v, &t->cnfa, &v->g->cmap, DOMALLOC); + v->subdfas[t->id] = newDFA(v, &t->cnfa, &v->g->cmap, NULL); if (ISERR()) return NULL; } diff --git a/generic/tclDate.c b/generic/tclDate.c index 89bc254..2ffa93d 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -2549,9 +2549,9 @@ LookupWord( YYSTYPE* yylvalPtr, char *buff) { - register char *p; - register char *q; - register const TABLE *tp; + char *p; + char *q; + const TABLE *tp; int i, abbrev; /* @@ -2674,8 +2674,8 @@ TclDatelex( YYLTYPE* location, DateInfo *info) { - register char c; - register char *p; + char c; + char *p; char buff[20]; int Count; diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index 7046b9a..9e1bd44 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -765,9 +765,9 @@ LookupWord( YYSTYPE* yylvalPtr, char *buff) { - register char *p; - register char *q; - register const TABLE *tp; + char *p; + char *q; + const TABLE *tp; int i, abbrev; /* @@ -890,8 +890,8 @@ TclDatelex( YYLTYPE* location, DateInfo *info) { - register char c; - register char *p; + char c; + char *p; char buff[20]; int Count; diff --git a/generic/tclTrace.c b/generic/tclTrace.c index c4112f1..c0f2349 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -1921,7 +1921,7 @@ TraceExecutionProc( if ((flags & TCL_TRACE_ENTER_EXEC) && (tcmdPtr->stepTrace == NULL) && (tcmdPtr->flags & (TCL_TRACE_ENTER_DURING_EXEC | TCL_TRACE_LEAVE_DURING_EXEC))) { - register unsigned len = strlen(command) + 1; + size_t len = strlen(command) + 1; tcmdPtr->startLevel = level; tcmdPtr->startCmd = Tcl_Alloc(len); |