From 362f5979d9efa6e7c1c38c1b75e41e91c710772b Mon Sep 17 00:00:00 2001 From: oes Date: Fri, 13 Jul 2001 14:04:59 +0000 Subject: [PATCH] Removed all #ifdef PCRS --- loaders.c | 14 ++++++-------- loaders.h | 13 ++++++++----- parsers.h | 10 ++++------ w32log.c | 11 ++++------- w32log.h | 8 ++++---- w32res.h | 8 ++++---- 6 files changed, 30 insertions(+), 34 deletions(-) diff --git a/loaders.c b/loaders.c index 7752a97f..8ce3c068 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.17 2001/06/29 13:31:51 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.18 2001/06/29 21:45:41 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.17 2001/06/29 13:31:51 oes Exp $" * * Revisions : * $Log: loaders.c,v $ + * Revision 1.18 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space + * * Revision 1.17 2001/06/29 13:31:51 oes * Various adaptions * @@ -185,9 +188,8 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; static struct file_list *current_trustfile = NULL; #endif /* def TRUST_FILES */ -#ifdef PCRS static struct file_list *current_re_filterfile = NULL; -#endif /* def PCRS */ + /********************************************************************* @@ -243,12 +245,10 @@ void sweep(void) ncsp->actions_list->active = 1; } -#ifdef PCRS - if (ncsp->rlist) /* perl re files */ + if (ncsp->rlist) /* pcrsjob files */ { ncsp->rlist->active = 1; } -#endif /* def PCRS */ #ifdef TRUST_FILES if (ncsp->tlist) /* trust files */ @@ -828,7 +828,6 @@ load_trustfile_error: #endif /* def TRUST_FILES */ -#ifdef PCRS /********************************************************************* * * Function : unload_re_filterfile @@ -957,7 +956,6 @@ load_re_filterfile_error: return(-1); } -#endif /* def PCRS */ /********************************************************************* diff --git a/loaders.h b/loaders.h index 7aa80e65..2ebb564a 100644 --- a/loaders.h +++ b/loaders.h @@ -1,6 +1,6 @@ #ifndef _LOADERS_H #define _LOADERS_H -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.5 2001/05/31 21:28:49 jongfoster Exp $" +#define LOADERS_H_VERSION "$Id: loaders.h,v 1.6 2001/06/07 23:14:38 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ @@ -37,6 +37,10 @@ * * Revisions : * $Log: loaders.h,v $ + * Revision 1.6 2001/06/07 23:14:38 jongfoster + * Removing ACL and forward file loaders - these files have + * been merged into the config file. + * * Revision 1.5 2001/05/31 21:28:49 jongfoster * Removed all permissionsfile code - it's now called the actions * file, and (almost) all the code is in actions.c @@ -104,14 +108,13 @@ extern int check_file_changed(const struct file_list * current, struct file_list ** newfl); extern int load_actions_file(struct client_state *csp); - +extern int load_re_filterfile(struct client_state *csp); + #ifdef TRUST_FILES extern int load_trustfile(struct client_state *csp); #endif /* def TRUST_FILES */ -#ifdef PCRS -extern int load_re_filterfile(struct client_state *csp); -#endif /* def PCRS */ + extern int create_url_spec(struct url_spec * url, char * buf); extern void free_url(struct url_spec *url); diff --git a/parsers.h b/parsers.h index 1ae901b0..b68ee8db 100644 --- a/parsers.h +++ b/parsers.h @@ -1,6 +1,6 @@ #ifndef _PARSERS_H #define _PARSERS_H -#define PARSERS_H_VERSION "$Id: parsers.h,v 1.6 2001/06/03 19:12:38 oes Exp $" +#define PARSERS_H_VERSION "$Id: parsers.h,v 1.7 2001/06/29 13:32:14 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -43,6 +43,9 @@ * * Revisions : * $Log: parsers.h,v $ + * Revision 1.7 2001/06/29 13:32:14 oes + * Removed logentry from cancelled commit + * * Revision 1.6 2001/06/03 19:12:38 oes * deleted const struct interceptors * @@ -112,13 +115,8 @@ extern void client_xtra_adder(struct client_state *csp); extern void client_x_forwarded_adder(struct client_state *csp); extern char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp); -#if defined(PCRS) || defined(KILLPOPUPS) extern char *content_type(const struct parsers *v, char *s, struct client_state *csp); -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ - -#ifdef PCRS extern char *content_length(const struct parsers *v, char *s, struct client_state *csp); -#endif /* def PCRS */ #ifdef FORCE_LOAD char *client_host(const struct parsers *v, char *s, struct client_state *csp); diff --git a/w32log.c b/w32log.c index 97e0bf14..9005eef7 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,4 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.10 2001/05/31 21:37:11 jongfoster Exp $"; +const char w32log_rcs[] = "$Id: w32log.c,v 1.11 2001/06/07 23:08:12 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -32,6 +32,9 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.10 2001/05/31 21:37:11 jongfoster E * * Revisions : * $Log: w32log.c,v $ + * Revision 1.11 2001/06/07 23:08:12 jongfoster + * Forward and ACL edit options removed. + * * Revision 1.10 2001/05/31 21:37:11 jongfoster * GUI changes to rename "permissions file" to "actions file". * @@ -198,9 +201,7 @@ int g_nFontSize = DEFAULT_LOG_FONT_SIZE; /* FIXME: this is a kludge */ const char * g_actions_file = NULL; -#ifdef PCRS const char * g_re_filterfile = NULL; -#endif #ifdef TRUST_FILES const char * g_trustfile = NULL; #endif /* def TRUST_FILES */ @@ -1114,11 +1115,9 @@ void OnLogCommand(int nCommand) EditFile(g_actions_file); break; -#ifdef PCRS case ID_TOOLS_EDITPERLRE: EditFile(g_re_filterfile); break; -#endif #ifdef TRUST_FILES case ID_TOOLS_EDITTRUST: @@ -1177,9 +1176,7 @@ void OnLogInitMenu(HMENU hmenu) { /* Only enable editors if there is a file to edit */ EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED)); -#ifdef PCRS EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED)); -#endif #ifdef TRUST_FILES EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED)); #endif /* def TRUST_FILES */ diff --git a/w32log.h b/w32log.h index f9072746..3c40c481 100644 --- a/w32log.h +++ b/w32log.h @@ -1,6 +1,6 @@ #ifndef _W32LOG_H #define _W32LOG_H -#define W32LOG_H_VERSION "$Id: w32log.h,v 1.4 2001/05/31 21:37:11 jongfoster Exp $" +#define W32LOG_H_VERSION "$Id: w32log.h,v 1.5 2001/06/07 23:08:12 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.h,v $ @@ -34,6 +34,9 @@ * * Revisions : * $Log: w32log.h,v $ + * Revision 1.5 2001/06/07 23:08:12 jongfoster + * Forward and ACL edit options removed. + * * Revision 1.4 2001/05/31 21:37:11 jongfoster * GUI changes to rename "permissions file" to "actions file". * @@ -111,16 +114,13 @@ extern int g_nFontSize; /* FIXME: this is a kludge */ extern const char * g_actions_file; -#ifdef PCRS extern const char * g_re_filterfile; -#endif #ifdef TRUST_FILES extern const char * g_trustfile; #endif /* def TRUST_FILES */ /* FIXME: end kludge */ - extern int LogPutString(const char *pszText); extern BOOL InitLogWindow(void); extern void TermLogWindow(void); diff --git a/w32res.h b/w32res.h index 1a31321e..33a37200 100644 --- a/w32res.h +++ b/w32res.h @@ -1,6 +1,6 @@ #ifndef _W32RES_H #define _W32RES_H -#define W32RES_H_VERSION "$Id: w32res.h,v 1.6 2001/05/31 21:37:11 jongfoster Exp $" +#define W32RES_H_VERSION "$Id: w32res.h,v 1.7 2001/06/07 23:08:12 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32res.h,v $ @@ -34,6 +34,9 @@ * * Revisions : * $Log: w32res.h,v $ + * Revision 1.7 2001/06/07 23:08:12 jongfoster + * Forward and ACL edit options removed. + * * Revision 1.6 2001/05/31 21:37:11 jongfoster * GUI changes to rename "permissions file" to "actions file". * @@ -151,10 +154,7 @@ /* Break these out so they are easier to extend, but keep consecutive */ #define ID_TOOLS_EDITJUNKBUSTER 5000 #define ID_TOOLS_EDITACTIONS 5001 - -#ifdef PCRS #define ID_TOOLS_EDITPERLRE 5002 -#endif /* def PCRS */ #ifdef TRUST_FILES #define ID_TOOLS_EDITTRUST 5003 -- 2.39.2