From 192b2c5dfe8876d8844007848712969fb64d6735 Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Tue, 21 Jan 2003 02:49:27 +0000 Subject: [PATCH] Developer TODO 612294: src: C++ keyword as variable name I changed all ocurrences of 'new' to 'new_something' wherever I found one. I also brought up all the source files in MSDEV to see if I could spot any highlighted keywords that really were variables. Non-scientific, but at least I tried. :-) --- src/amiga.c | 15 +++++++++------ src/filters.c | 18 +++++++++++------- src/pcrs.c | 15 +++++++++------ 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/amiga.c b/src/amiga.c index 6964eabc..97d9f75a 100644 --- a/src/amiga.c +++ b/src/amiga.c @@ -1,7 +1,7 @@ -const char amiga_rcs[] = "$Id: amiga.c,v 1.9 2002/03/26 22:29:54 swa Exp $"; +const char amiga_rcs[] = "$Id: amiga.c,v 2.0 2002/06/04 14:34:21 jongfoster Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/amiga.c,v $ + * File : $Source: /cvsroot/ijbswa/current/src/amiga.c,v $ * * Purpose : Amiga-specific declarations. * @@ -28,6 +28,9 @@ const char amiga_rcs[] = "$Id: amiga.c,v 1.9 2002/03/26 22:29:54 swa Exp $"; * * Revisions : * $Log: amiga.c,v $ + * Revision 2.0 2002/06/04 14:34:21 jongfoster + * Moving source files to src/ + * * Revision 1.9 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -229,7 +232,7 @@ void free (void *m) void *realloc (void *old, size_t ns) { - void *new; + void *new_buf; LONG osize, *o = old; LONG nsize = ns; @@ -242,9 +245,9 @@ void *realloc (void *old, size_t ns) { return old; } - if ((new = malloc(nsize))) + if ((new_buf = malloc(nsize))) { - ULONG *n = new; + ULONG *n = new_buf; osize >>= 2; while(osize--) @@ -253,7 +256,7 @@ void *realloc (void *old, size_t ns) } free(old); } - return new; + return new_buf; } void __memCleanUp (void) diff --git a/src/filters.c b/src/filters.c index e761a7f3..814cf206 100644 --- a/src/filters.c +++ b/src/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 2.2 2002/09/04 15:38:24 oes Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 2.3 2002/12/28 03:58:19 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/src/filters.c,v $ @@ -38,6 +38,10 @@ const char filters_rcs[] = "$Id: filters.c,v 2.2 2002/09/04 15:38:24 oes Exp $"; * * Revisions : * $Log: filters.c,v $ + * Revision 2.3 2002/12/28 03:58:19 david__schmidt + * Initial drop of dashboard instrumentation - enabled with + * --enable-activity-console + * * Revision 2.2 2002/09/04 15:38:24 oes * Synced with the stable branch: * Revision 1.58.2.2 2002/08/01 17:18:28 oes @@ -1290,7 +1294,7 @@ char *pcrs_filter_response(struct client_state *csp) int hits=0; size_t size; - char *old = csp->iob->cur, *new = NULL; + char *old_buf = csp->iob->cur, *new_buf = NULL; pcrs_job *job; struct file_list *fl; @@ -1353,9 +1357,9 @@ char *pcrs_filter_response(struct client_state *csp) /* Apply all jobs from the joblist */ for (job = b->joblist; NULL != job; job = job->next) { - current_hits += pcrs_execute(job, old, size, &new, &size); - if (old != csp->iob->cur) free(old); - old=new; + current_hits += pcrs_execute(job, old_buf, size, &new_buf, &size); + if (old_buf != csp->iob->cur) free(old_buf); + old_buf=new_buf; } log_error(LOG_LEVEL_RE_FILTER, " ...produced %d hits (new size %d).", current_hits, size); @@ -1370,7 +1374,7 @@ char *pcrs_filter_response(struct client_state *csp) */ if (!hits) { - free(new); + free(new_buf); return(NULL); } #ifdef FEATURE_ACTIVITY_CONSOLE @@ -1382,7 +1386,7 @@ char *pcrs_filter_response(struct client_state *csp) csp->content_length = size; IOB_RESET(csp); - return(new); + return(new_buf); } diff --git a/src/pcrs.c b/src/pcrs.c index b6679f47..07597440 100644 --- a/src/pcrs.c +++ b/src/pcrs.c @@ -1,4 +1,4 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 2.2 2002/09/04 15:52:02 oes Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 2.3 2002/10/08 16:25:30 oes Exp $"; /********************************************************************* * @@ -33,6 +33,9 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 2.2 2002/09/04 15:52:02 oes Exp $"; * * Revisions : * $Log: pcrs.c,v $ + * Revision 2.3 2002/10/08 16:25:30 oes + * Bugfix: Need to check validity of backreferences explicitly, because when max_matches are reached and matches is expanded, realloc() does not zero the memory. Fixes Bug # 606227 + * * Revision 2.2 2002/09/04 15:52:02 oes * Synced with the stable branch: * Revision 1.19.2.1 2002/08/10 11:23:40 oes @@ -740,18 +743,18 @@ pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char * int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, char **result, size_t *result_length) { pcrs_job *job; - char *old, *new; + char *old_item, *new_item; int hits, total_hits; - old = subject; + old_item = subject; *result_length = subject_length; hits = total_hits = 0; for (job = joblist; job != NULL; job = job->next) { - hits = pcrs_execute(job, old, *result_length, &new, result_length); + hits = pcrs_execute(job, old_item, *result_length, &new_item, result_length); - if (old != subject) free(old); + if (old_item != subject) free(old_item); if (hits < 0) { @@ -760,7 +763,7 @@ int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, c else { total_hits += hits; - old = new; + old_item = new_item; } } -- 2.39.2