From 5ca53f92bc634c20fed90f338ac41561f87b834c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 1 Mar 2018 12:08:52 +0100 Subject: [PATCH] Remove show_rcs() and the CVS ids it relied upon --- actions.c | 4 -- actions.h | 5 --- amiga.c | 3 -- amiga.h | 1 - cgi.c | 3 -- cgi.h | 5 --- cgiedit.c | 3 -- cgiedit.h | 5 --- cgisimple.c | 103 -------------------------------------------------- cgisimple.h | 5 --- client-tags.h | 1 - cygwin.h | 1 - deanimate.c | 3 -- deanimate.h | 6 --- encode.c | 3 -- encode.h | 5 --- errlog.c | 4 -- errlog.h | 5 --- filters.c | 3 -- filters.h | 7 ---- gateway.c | 3 -- gateway.h | 7 ---- jbsockets.c | 3 -- jbsockets.h | 5 --- jcc.c | 4 -- jcc.h | 5 --- list.c | 4 -- list.h | 6 --- loadcfg.c | 3 -- loadcfg.h | 5 --- loaders.c | 3 -- loaders.h | 5 --- miscutil.c | 3 -- miscutil.h | 5 --- parsers.c | 3 -- parsers.h | 5 --- pcrs.c | 3 -- pcrs.h | 2 - project.h | 2 - ssplit.c | 3 -- ssplit.h | 5 --- urlmatch.c | 3 -- urlmatch.h | 6 --- w32log.c | 5 --- w32log.h | 5 --- w32res.h | 1 - w32svrapi.c | 3 -- w32svrapi.h | 1 - w32taskbar.c | 3 -- w32taskbar.h | 5 --- win32.c | 3 -- win32.h | 5 --- 52 files changed, 299 deletions(-) diff --git a/actions.c b/actions.c index 7320850b..6249de9e 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,3 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.97 2016/05/03 13:20:37 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -57,9 +56,6 @@ const char actions_rcs[] = "$Id: actions.c,v 1.97 2016/05/03 13:20:37 fabiankeil #include "ssplit.h" #include "filters.h" -const char actions_h_rcs[] = ACTIONS_H_VERSION; - - /* * We need the main list of options. * diff --git a/actions.h b/actions.h index c7b89b3c..af401766 100644 --- a/actions.h +++ b/actions.h @@ -1,6 +1,5 @@ #ifndef ACTIONS_H_INCLUDED #define ACTIONS_H_INCLUDED -#define ACTIONS_H_VERSION "$Id: actions.h,v 1.25 2016/12/24 16:00:49 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.h,v $ @@ -87,10 +86,6 @@ void unload_current_actions_file(void); #endif -/* Revision control strings from this header and associated .c file */ -extern const char actions_rcs[]; -extern const char actions_h_rcs[]; - #endif /* ndef ACTIONS_H_INCLUDED */ /* diff --git a/amiga.c b/amiga.c index 984ca86d..7a6fa2be 100644 --- a/amiga.c +++ b/amiga.c @@ -1,4 +1,3 @@ -const char amiga_rcs[] = "$Id: amiga.c,v 1.16 2012/03/09 16:24:36 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/amiga.c,v $ @@ -38,8 +37,6 @@ const char amiga_rcs[] = "$Id: amiga.c,v 1.16 2012/03/09 16:24:36 fabiankeil Exp #include "project.h" -const char amiga_h_rcs[] = AMIGA_H_VERSION; - static char *ver USED = "$VER: Privoxy " __AMIGAVERSION__ " (" __AMIGADATE__ ")"; #ifdef __amigaos4__ static char *stack USED = "$STACK: 524288"; diff --git a/amiga.h b/amiga.h index 6745cc70..82a5cf00 100644 --- a/amiga.h +++ b/amiga.h @@ -1,7 +1,6 @@ #ifdef AMIGA #ifndef AMIGA_H_INCLUDED #define AMIGA_H_INCLUDED -#define AMIGA_H_VERSION "$Id: amiga.h,v 1.14 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/amiga.h,v $ diff --git a/cgi.c b/cgi.c index 8a4eea0c..f752f773 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,3 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.173 2017/03/08 13:16:26 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -69,8 +68,6 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.173 2017/03/08 13:16:26 fabiankeil Exp $" /* jcc.h is for mutex semaphore globals only */ #include "jcc.h" -const char cgi_h_rcs[] = CGI_H_VERSION; - /* * List of CGI functions: name, handler, description * Note: Do NOT use single quotes in the description; diff --git a/cgi.h b/cgi.h index be1dbf7b..ba858d25 100644 --- a/cgi.h +++ b/cgi.h @@ -1,6 +1,5 @@ #ifndef CGI_H_INCLUDED #define CGI_H_INCLUDED -#define CGI_H_VERSION "$Id: cgi.h,v 1.42 2012/11/09 10:47:42 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.h,v $ @@ -122,10 +121,6 @@ extern const size_t image_pattern_length; extern const char image_blank_data[]; extern const size_t image_blank_length; -/* Revision control strings from this header and associated .c file */ -extern const char cgi_rcs[]; -extern const char cgi_h_rcs[]; - #endif /* ndef CGI_H_INCLUDED */ /* diff --git a/cgiedit.c b/cgiedit.c index 4579b35b..750015cf 100644 --- a/cgiedit.c +++ b/cgiedit.c @@ -1,4 +1,3 @@ -const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.88 2016/02/26 12:29:38 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $ @@ -71,8 +70,6 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.88 2016/02/26 12:29:38 fabiankeil #endif /* def FEATURE_TOGGLE */ #include "urlmatch.h" -const char cgiedit_h_rcs[] = CGIEDIT_H_VERSION; - #ifdef FEATURE_CGI_EDIT_ACTIONS diff --git a/cgiedit.h b/cgiedit.h index ffa69dc3..b0076cf6 100644 --- a/cgiedit.h +++ b/cgiedit.h @@ -1,6 +1,5 @@ #ifndef CGIEDIT_H_INCLUDED #define CGIEDIT_H_INCLUDED -#define CGIEDIT_H_VERSION "$Id: cgiedit.h,v 1.13 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.h,v $ @@ -90,10 +89,6 @@ extern jb_err cgi_toggle(struct client_state *csp, const struct map *parameters); #endif /* def FEATURE_TOGGLE */ -/* Revision control strings from this header and associated .c file */ -extern const char cgiedit_rcs[]; -extern const char cgiedit_h_rcs[]; - #endif /* ndef CGI_H_INCLUDED */ /* diff --git a/cgisimple.c b/cgisimple.c index 562eeb63..2a1ab8fb 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,3 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.149 2017/05/04 14:33:17 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -64,9 +63,6 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.149 2017/05/04 14:33:17 fabia #include "client-tags.h" #endif -const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; - -static char *show_rcs(void); static jb_err show_defines(struct map *exports); static jb_err cgi_show_file(struct client_state *csp, struct http_response *rsp, @@ -1068,12 +1064,6 @@ jb_err cgi_show_version(struct client_state *csp, return JB_ERR_MEMORY; } - if (map(exports, "sourceversions", 1, show_rcs(), 0)) - { - free_map(exports); - return JB_ERR_MEMORY; - } - return template_fill_for_cgi(csp, "show-version", exports, rsp); } @@ -1973,99 +1963,6 @@ static jb_err show_defines(struct map *exports) } -/********************************************************************* - * - * Function : show_rcs - * - * Description : Create a string with the rcs info for all sourcefiles - * - * Parameters : None - * - * Returns : A string, or NULL on out-of-memory. - * - *********************************************************************/ -static char *show_rcs(void) -{ - char *result = strdup_or_die(""); - char buf[BUFFER_SIZE]; - - /* Instead of including *all* dot h's in the project (thus creating a - * tremendous amount of dependencies), I will concede to declaring them - * as extern's. This forces the developer to add to this list, but oh well. - */ - -#define SHOW_RCS(__x) \ - { \ - extern const char __x[]; \ - snprintf(buf, sizeof(buf), " %s\n", __x); \ - string_append(&result, buf); \ - } - - /* In alphabetical order */ - SHOW_RCS(actions_h_rcs) - SHOW_RCS(actions_rcs) -#ifdef AMIGA - SHOW_RCS(amiga_h_rcs) - SHOW_RCS(amiga_rcs) -#endif /* def AMIGA */ - SHOW_RCS(cgi_h_rcs) - SHOW_RCS(cgi_rcs) -#ifdef FEATURE_CGI_EDIT_ACTIONS - SHOW_RCS(cgiedit_h_rcs) - SHOW_RCS(cgiedit_rcs) -#endif /* def FEATURE_CGI_EDIT_ACTIONS */ - SHOW_RCS(cgisimple_h_rcs) - SHOW_RCS(cgisimple_rcs) - SHOW_RCS(deanimate_h_rcs) - SHOW_RCS(deanimate_rcs) - SHOW_RCS(encode_h_rcs) - SHOW_RCS(encode_rcs) - SHOW_RCS(errlog_h_rcs) - SHOW_RCS(errlog_rcs) - SHOW_RCS(filters_h_rcs) - SHOW_RCS(filters_rcs) - SHOW_RCS(gateway_h_rcs) - SHOW_RCS(gateway_rcs) - SHOW_RCS(jbsockets_h_rcs) - SHOW_RCS(jbsockets_rcs) - SHOW_RCS(jcc_h_rcs) - SHOW_RCS(jcc_rcs) - SHOW_RCS(list_h_rcs) - SHOW_RCS(list_rcs) - SHOW_RCS(loadcfg_h_rcs) - SHOW_RCS(loadcfg_rcs) - SHOW_RCS(loaders_h_rcs) - SHOW_RCS(loaders_rcs) - SHOW_RCS(miscutil_h_rcs) - SHOW_RCS(miscutil_rcs) - SHOW_RCS(parsers_h_rcs) - SHOW_RCS(parsers_rcs) - SHOW_RCS(pcrs_rcs) - SHOW_RCS(pcrs_h_rcs) - SHOW_RCS(project_h_rcs) - SHOW_RCS(ssplit_h_rcs) - SHOW_RCS(ssplit_rcs) - SHOW_RCS(urlmatch_h_rcs) - SHOW_RCS(urlmatch_rcs) -#ifdef _WIN32 -#ifndef _WIN_CONSOLE - SHOW_RCS(w32log_h_rcs) - SHOW_RCS(w32log_rcs) - SHOW_RCS(w32res_h_rcs) - SHOW_RCS(w32taskbar_h_rcs) - SHOW_RCS(w32taskbar_rcs) -#endif /* ndef _WIN_CONSOLE */ - SHOW_RCS(win32_h_rcs) - SHOW_RCS(win32_rcs) -#endif /* def _WIN32 */ - -#undef SHOW_RCS - - return result; - -} - - /********************************************************************* * * Function : cgi_show_file diff --git a/cgisimple.h b/cgisimple.h index c9403dfb..271a707a 100644 --- a/cgisimple.h +++ b/cgisimple.h @@ -1,6 +1,5 @@ #ifndef CGISIMPLE_H_INCLUDED #define CGISIMPLE_H_INCLUDED -#define CGISIMPLE_H_VERSION "$Id: cgisimple.h,v 1.22 2017/01/23 13:04:58 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.h,v $ @@ -102,10 +101,6 @@ extern jb_err cgi_die (struct client_state *csp, const struct map *parameters); #endif -/* Revision control strings from this header and associated .c file */ -extern const char cgisimple_rcs[]; -extern const char cgisimple_h_rcs[]; - #endif /* ndef CGISIMPLE_H_INCLUDED */ /* diff --git a/client-tags.h b/client-tags.h index 24b45c1c..bf694519 100644 --- a/client-tags.h +++ b/client-tags.h @@ -1,6 +1,5 @@ #ifndef CLIENT_TAGS_H_INCLUDED #define CLIENT_TAGS_H_INCLUDED -#define CLIENT_TAGS_H_VERSION "$Id: client-tags.h,v 1.3 2016/05/22 12:43:07 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/client-tags.h,v $ diff --git a/cygwin.h b/cygwin.h index d96f7283..6cf08f1a 100644 --- a/cygwin.h +++ b/cygwin.h @@ -1,6 +1,5 @@ #ifndef CYGWIN_H_INCLUDED #define CYGWIN_H_INCLUDED -#define CYGWIN_H_VERSION "$Id: cygwin.h,v 1.8 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cygwin.h,v $ diff --git a/deanimate.c b/deanimate.c index 10b630fe..ae0d96a8 100644 --- a/deanimate.c +++ b/deanimate.c @@ -1,4 +1,3 @@ -const char deanimate_rcs[] = "$Id: deanimate.c,v 1.23 2012/03/09 16:24:36 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/deanimate.c,v $ @@ -46,8 +45,6 @@ const char deanimate_rcs[] = "$Id: deanimate.c,v 1.23 2012/03/09 16:24:36 fabian #include "deanimate.h" #include "miscutil.h" -const char deanimate_h_rcs[] = DEANIMATE_H_VERSION; - /********************************************************************* * * Function : buf_free diff --git a/deanimate.h b/deanimate.h index 7dc05e39..2f329e74 100644 --- a/deanimate.h +++ b/deanimate.h @@ -1,6 +1,5 @@ #ifndef DEANIMATE_H_INCLUDED #define DEANIMATE_H_INCLUDED -#define DEANIMATE_H_VERSION "$Id: deanimate.h,v 1.14 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/deanimate.h,v $ @@ -60,11 +59,6 @@ struct binbuffer extern int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_image); extern void buf_free(struct binbuffer *buf); -/* - * Revision control strings from this header and associated .c file - */ -extern const char deanimate_rcs[]; -extern const char deanimate_h_rcs[]; #endif /* ndef DEANIMATE_H_INCLUDED */ diff --git a/encode.c b/encode.c index 3ce4cc56..58ba5014 100644 --- a/encode.c +++ b/encode.c @@ -1,4 +1,3 @@ -const char encode_rcs[] = "$Id: encode.c,v 1.28 2012/12/27 15:48:53 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/encode.c,v $ @@ -44,8 +43,6 @@ const char encode_rcs[] = "$Id: encode.c,v 1.28 2012/12/27 15:48:53 fabiankeil E #include "miscutil.h" #include "encode.h" -const char encode_h_rcs[] = ENCODE_H_VERSION; - /* Maps special characters in a URL to their equivalent % codes. */ static const char url_code_map[256][4] = { "", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", diff --git a/encode.h b/encode.h index 305c4021..f4acb24c 100644 --- a/encode.h +++ b/encode.h @@ -1,6 +1,5 @@ #ifndef ENCODE_H_INCLUDED #define ENCODE_H_INCLUDED -#define ENCODE_H_VERSION "$Id: encode.h,v 1.13 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/encode.h,v $ @@ -43,10 +42,6 @@ extern int xtoi(const char *s); extern char * html_encode_and_free_original(char *s); extern char * percent_encode_url(const char *s); -/* Revision control strings from this header and associated .c file */ -extern const char encode_rcs[]; -extern const char encode_h_rcs[]; - #endif /* ndef ENCODE_H_INCLUDED */ /* diff --git a/errlog.c b/errlog.c index 559069da..21e062db 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,3 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.129 2017/05/29 10:06:57 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -79,9 +78,6 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.129 2017/05/29 10:06:57 fabiankeil #include "jbsockets.h" #endif -const char errlog_h_rcs[] = ERRLOG_H_VERSION; - - /* * LOG_LEVEL_FATAL cannot be turned off. (There are * some exceptional situations where we need to get a diff --git a/errlog.h b/errlog.h index a6a0c106..9abaad39 100644 --- a/errlog.h +++ b/errlog.h @@ -1,6 +1,5 @@ #ifndef ERRLOG_H_INCLUDED #define ERRLOG_H_INCLUDED -#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.31 2016/12/24 16:00:49 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.h,v $ @@ -78,10 +77,6 @@ extern void show_version(const char *prog_name); extern void log_error(int loglevel, const char *fmt, ...); extern const char *jb_err_to_string(int jb_error); -/* Revision control strings from this header and associated .c file */ -extern const char errlog_rcs[]; -extern const char errlog_h_rcs[]; - #endif /* ndef ERRLOG_H_INCLUDED */ /* diff --git a/filters.c b/filters.c index 2aa658e0..d45ff949 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,3 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.206 2017/06/04 14:43:10 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -78,8 +77,6 @@ const char filters_rcs[] = "$Id: filters.c,v 1.206 2017/06/04 14:43:10 fabiankei #include "win32.h" #endif -const char filters_h_rcs[] = FILTERS_H_VERSION; - typedef char *(*filter_function_ptr)(); static filter_function_ptr get_filter_function(const struct client_state *csp); static jb_err prepare_for_filtering(struct client_state *csp); diff --git a/filters.h b/filters.h index 858832ae..1a52f0a4 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,5 @@ #ifndef FILTERS_H_INCLUDED #define FILTERS_H_INCLUDED -#define FILTERS_H_VERSION "$Id: filters.h,v 1.48 2016/12/24 16:00:49 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -100,12 +99,6 @@ extern int filters_available(const struct client_state *csp); */ extern struct http_response *direct_response(struct client_state *csp); -/* - * Revision control strings from this header and associated .c file - */ -extern const char filters_rcs[]; -extern const char filters_h_rcs[]; - #ifdef FUZZ extern char *gif_deanimate_response(struct client_state *csp); extern jb_err remove_chunked_transfer_coding(char *buffer, size_t *size); diff --git a/gateway.c b/gateway.c index fd3d33c6..c84e3b28 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,3 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.103 2017/07/01 18:34:07 ler762 Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -79,8 +78,6 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.103 2017/07/01 18:34:07 ler762 Ex #endif /* HAVE_POLL */ #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ -const char gateway_h_rcs[] = GATEWAY_H_VERSION; - static jb_socket socks4_connect(const struct forward_spec * fwd, const char * target_host, int target_port, diff --git a/gateway.h b/gateway.h index c1d8add1..544752cd 100644 --- a/gateway.h +++ b/gateway.h @@ -1,6 +1,5 @@ #ifndef GATEWAY_H_INCLUDED #define GATEWAY_H_INCLUDED -#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.25 2017/06/04 14:42:13 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ @@ -63,12 +62,6 @@ extern int connection_destination_matches(const struct reusable_connection *conn extern jb_err socks_fuzz(struct client_state *csp); #endif -/* - * Revision control strings from this header and associated .c file - */ -extern const char gateway_rcs[]; -extern const char gateway_h_rcs[]; - #endif /* ndef GATEWAY_H_INCLUDED */ /* diff --git a/jbsockets.c b/jbsockets.c index f502ebe8..0f1ba16b 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,3 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.147 2017/06/26 12:12:55 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -107,8 +106,6 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.147 2017/06/26 12:12:55 fabia #define AI_NUMERICSERV 0 #endif -const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; - /* * Maximum number of gethostbyname(_r) retries in case of * soft errors (TRY_AGAIN). diff --git a/jbsockets.h b/jbsockets.h index d8cbd188..8382807c 100644 --- a/jbsockets.h +++ b/jbsockets.h @@ -1,6 +1,5 @@ #ifndef JBSOCKETS_H_INCLUDED #define JBSOCKETS_H_INCLUDED -#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.25 2017/06/04 14:37:05 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.h,v $ @@ -65,10 +64,6 @@ extern int socket_is_still_alive(jb_socket sfd); extern void mark_socket_for_close_on_execute(jb_socket fd); #endif -/* Revision control strings from this header and associated .c file */ -extern const char jbsockets_rcs[]; -extern const char jbsockets_h_rcs[]; - /* * Solaris workaround * XXX: still necessary? diff --git a/jcc.c b/jcc.c index e7d88400..8ce341b6 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,3 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -128,9 +127,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $" #include "client-tags.h" #endif -const char jcc_h_rcs[] = JCC_H_VERSION; -const char project_h_rcs[] = PROJECT_H_VERSION; - int daemon_mode = 1; struct client_states clients[1]; struct file_list files[1]; diff --git a/jcc.h b/jcc.h index 083348af..866c2a7b 100644 --- a/jcc.h +++ b/jcc.h @@ -1,6 +1,5 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.36 2016/03/17 10:40:53 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ @@ -113,10 +112,6 @@ int real_main(int argc, char **argv); int main(int argc, char **argv); #endif -/* Revision control strings from this header and associated .c file */ -extern const char jcc_rcs[]; -extern const char jcc_h_rcs[]; - #ifdef FUZZ extern int fuzz_client_request(struct client_state *csp, char *fuzz_input_file); extern int fuzz_server_response(struct client_state *csp, char *fuzz_input_file); diff --git a/list.c b/list.c index e0736d39..dadba717 100644 --- a/list.c +++ b/list.c @@ -1,4 +1,3 @@ -const char list_rcs[] = "$Id: list.c,v 1.32 2014/11/14 10:39:49 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/list.c,v $ @@ -56,9 +55,6 @@ const char list_rcs[] = "$Id: list.c,v 1.32 2014/11/14 10:39:49 fabiankeil Exp $ #include "list.h" #include "miscutil.h" -const char list_h_rcs[] = LIST_H_VERSION; - - static int list_is_valid (const struct list *the_list); diff --git a/list.h b/list.h index e3035b71..a6688273 100644 --- a/list.h +++ b/list.h @@ -1,6 +1,5 @@ #ifndef LIST_H_INCLUDED #define LIST_H_INCLUDED -#define LIST_H_VERSION "$Id: list.h,v 1.19 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/list.h,v $ @@ -84,11 +83,6 @@ extern jb_err unmap (struct map *the_map, const char *name); extern const char * lookup (const struct map * the_map, const char * name); - -/* Revision control strings from this header and associated .c file */ -extern const char list_rcs[]; -extern const char list_h_rcs[]; - #endif /* ndef LIST_H_INCLUDED */ /* diff --git a/loadcfg.c b/loadcfg.c index c8542ace..77f2b550 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,3 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.165 2017/06/26 12:13:52 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -101,8 +100,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.165 2017/06/26 12:13:52 fabiankei */ #define DEFAULT_LISTEN_BACKLOG 128 -const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; - #ifdef FEATURE_TOGGLE /* Privoxy is enabled by default. */ int global_toggle_state = 1; diff --git a/loadcfg.h b/loadcfg.h index e58ff215..5f88f611 100644 --- a/loadcfg.h +++ b/loadcfg.h @@ -1,6 +1,5 @@ #ifndef LOADCFG_H_INCLUDED #define LOADCFG_H_INCLUDED -#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.17 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.h,v $ @@ -67,10 +66,6 @@ extern struct configuration_spec * load_config(void); void unload_current_config_file(void); #endif -/* Revision control strings from this header and associated .c file */ -extern const char loadcfg_rcs[]; -extern const char loadcfg_h_rcs[]; - #endif /* ndef LOADCFG_H_INCLUDED */ /* diff --git a/loaders.c b/loaders.c index 9ec017ce..7683fa56 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,3 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.108 2017/06/26 12:17:57 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -63,8 +62,6 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.108 2017/06/26 12:17:57 fabiankei #include "urlmatch.h" #include "encode.h" -const char loaders_h_rcs[] = LOADERS_H_VERSION; - /* * Currently active files. * These are also entered in the main linked list of files. diff --git a/loaders.h b/loaders.h index a2abec34..a3db010c 100644 --- a/loaders.h +++ b/loaders.h @@ -1,6 +1,5 @@ #ifndef LOADERS_H_INCLUDED #define LOADERS_H_INCLUDED -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.33 2016/12/24 16:00:49 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ @@ -98,10 +97,6 @@ extern int run_loader(struct client_state *csp); extern int any_loaded_file_changed(const struct client_state *csp); -/* Revision control strings from this header and associated .c file */ -extern const char loaders_rcs[]; -extern const char loaders_h_rcs[]; - #endif /* ndef LOADERS_H_INCLUDED */ /* diff --git a/miscutil.c b/miscutil.c index 79b1ae61..97acd1ea 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,3 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.85 2017/06/08 13:11:08 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -64,8 +63,6 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.85 2017/06/08 13:11:08 fabianke #include "miscutil.h" #include "errlog.h" -const char miscutil_h_rcs[] = MISCUTIL_H_VERSION; - /********************************************************************* * * Function : zalloc diff --git a/miscutil.h b/miscutil.h index 33e2996f..e7c150ac 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,5 @@ #ifndef MISCUTIL_H_INCLUDED #define MISCUTIL_H_INCLUDED -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.37 2012/11/24 13:58:17 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -92,10 +91,6 @@ size_t privoxy_strlcat(char *destination, const char *source, size_t size); #define strlcat privoxy_strlcat #endif /* ndef HAVE_STRLCAT */ -/* Revision control strings from this header and associated .c file */ -extern const char miscutil_rcs[]; -extern const char miscutil_h_rcs[]; - #if defined(__cplusplus) } #endif diff --git a/parsers.c b/parsers.c index 321eea07..c1d4d42e 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,3 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.313 2017/07/01 17:14:12 ler762 Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -90,8 +89,6 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.313 2017/07/01 17:14:12 ler762 Ex #include "strptime.h" #endif -const char parsers_h_rcs[] = PARSERS_H_VERSION; - static char *get_header_line(struct iob *iob); static jb_err scan_headers(struct client_state *csp); static jb_err header_tagger(struct client_state *csp, char *header); diff --git a/parsers.h b/parsers.h index 50f59b23..00de2860 100644 --- a/parsers.h +++ b/parsers.h @@ -1,6 +1,5 @@ #ifndef PARSERS_H_INCLUDED #define PARSERS_H_INCLUDED -#define PARSERS_H_VERSION "$Id: parsers.h,v 1.56 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -67,10 +66,6 @@ extern jb_err client_transfer_encoding(struct client_state *csp, char **header); extern int strclean(char *string, const char *substring); #endif /* def FEATURE_FORCE_LOAD */ -/* Revision control strings from this header and associated .c file */ -extern const char parsers_rcs[]; -extern const char parsers_h_rcs[]; - #endif /* ndef PARSERS_H_INCLUDED */ /* diff --git a/pcrs.c b/pcrs.c index 8a09d394..0b746a1d 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,4 +1,3 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.52 2017/05/29 10:09:37 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $ @@ -55,8 +54,6 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.52 2017/05/29 10:09:37 fabiankeil Exp $ #include "pcrs.h" -const char pcrs_h_rcs[] = PCRS_H_VERSION; - /* * Internal prototypes */ diff --git a/pcrs.h b/pcrs.h index dc9533d1..5fab6110 100644 --- a/pcrs.h +++ b/pcrs.h @@ -11,8 +11,6 @@ * *********************************************************************/ -#define PCRS_H_VERSION "$Id: pcrs.h,v 1.18 2013/11/24 14:23:28 fabiankeil Exp $" - #ifndef _PCRE_H #include diff --git a/project.h b/project.h index c8b7ea23..c23ca50c 100644 --- a/project.h +++ b/project.h @@ -1,7 +1,5 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED -/** Version string. */ -#define PROJECT_H_VERSION "$Id: project.h,v 1.223 2017/06/26 12:13:52 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ diff --git a/ssplit.c b/ssplit.c index 01618989..f525aba6 100644 --- a/ssplit.c +++ b/ssplit.c @@ -1,4 +1,3 @@ -const char ssplit_rcs[] = "$Id: ssplit.c,v 1.19 2012/07/23 12:46:40 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/ssplit.c,v $ @@ -42,8 +41,6 @@ const char ssplit_rcs[] = "$Id: ssplit.c,v 1.19 2012/07/23 12:46:40 fabiankeil E #include "ssplit.h" #include "miscutil.h" -const char ssplit_h_rcs[] = SSPLIT_H_VERSION; - /********************************************************************* * diff --git a/ssplit.h b/ssplit.h index 0302b4e9..d5a60348 100644 --- a/ssplit.h +++ b/ssplit.h @@ -1,6 +1,5 @@ #ifndef SSPLIT_H_INCLUDED #define SSPLIT_H_INCLUDED -#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.12 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/ssplit.h,v $ @@ -37,10 +36,6 @@ extern int ssplit(char *str, const char *delim, char *vec[], size_t vec_len); -/* Revision control strings from this header and associated .c file */ -extern const char ssplit_rcs[]; -extern const char ssplit_h_rcs[]; - #endif /* ndef SSPLIT_H_INCLUDED */ /* diff --git a/urlmatch.c b/urlmatch.c index 37802c5f..c8029d84 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -1,4 +1,3 @@ -const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.88 2016/03/17 10:40:53 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $ @@ -56,8 +55,6 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.88 2016/03/17 10:40:53 fabianke #include "miscutil.h" #include "errlog.h" -const char urlmatch_h_rcs[] = URLMATCH_H_VERSION; - enum regex_anchoring { NO_ANCHORING, diff --git a/urlmatch.h b/urlmatch.h index 35befbdd..ed3da548 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -1,6 +1,5 @@ #ifndef URLMATCH_H_INCLUDED #define URLMATCH_H_INCLUDED -#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.20 2013/11/24 14:23:28 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.h,v $ @@ -58,11 +57,6 @@ extern void free_pattern_spec(struct pattern_spec *url); extern int match_portlist(const char *portlist, int port); extern jb_err parse_forwarder_address(char *address, char **hostname, int *port); - -/* Revision control strings from this header and associated .c file */ -extern const char urlmatch_rcs[]; -extern const char urlmatch_h_rcs[]; - #endif /* ndef URLMATCH_H_INCLUDED */ /* diff --git a/w32log.c b/w32log.c index ae00ba59..fc8c61b8 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,3 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.52 2016/07/28 00:38:47 ler762 Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -55,10 +54,6 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.52 2016/07/28 00:38:47 ler762 Exp $ #include "errlog.h" #include "loadcfg.h" -const char w32res_h_rcs[] = W32RES_H_VERSION; - -const char w32log_h_rcs[] = W32LOG_H_VERSION; - #ifndef _WIN_CONSOLE /* entire file */ /* diff --git a/w32log.h b/w32log.h index b20917ee..d340002c 100644 --- a/w32log.h +++ b/w32log.h @@ -1,6 +1,5 @@ #ifndef W32LOG_H_INCLUDED #define W32LOG_H_INCLUDED -#define W32LOG_H_VERSION "$Id: w32log.h,v 1.16 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.h,v $ @@ -84,10 +83,6 @@ extern void TermLogWindow(void); extern void ShowLogWindow(BOOL bShow); extern void LogShowActivity(void); -/* Revision control strings from this header and associated .c file */ -extern const char w32log_rcs[]; -extern const char w32log_h_rcs[]; - #endif /* ndef W32LOG_H_INCLUDED */ diff --git a/w32res.h b/w32res.h index ba7f88ad..706d7828 100644 --- a/w32res.h +++ b/w32res.h @@ -1,6 +1,5 @@ #ifndef W32RES_H_INCLUDED #define W32RES_H_INCLUDED -#define W32RES_H_VERSION "$Id: w32res.h,v 1.19 2010/08/16 21:39:19 ler762 Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32res.h,v $ diff --git a/w32svrapi.c b/w32svrapi.c index 908a6ffa..097414ff 100644 --- a/w32svrapi.c +++ b/w32svrapi.c @@ -1,4 +1,3 @@ -const char w32_svrapi_rcs[] = "$Id: w32svrapi.c,v 1.5 2011/09/04 11:10:56 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32svrapi.c,v $ @@ -64,8 +63,6 @@ const char w32_svrapi_rcs[] = "$Id: w32svrapi.c,v 1.5 2011/09/04 11:10:56 fabian #endif /* ndef _WIN_CONSOLE */ #include "w32svrapi.h" -const char w32_svrapi_h_rcs[] = W32_SVRAPI_H_VERSION; - /* Only the ANSI Win32 APIs are used at this time. If for some * reason, we're building under unicode then we must stop diff --git a/w32svrapi.h b/w32svrapi.h index 4f070ef6..d38cbe47 100644 --- a/w32svrapi.h +++ b/w32svrapi.h @@ -1,6 +1,5 @@ #ifndef W32_SVRAPI_H_INCLUDED #define W32_SVRAPI_H_INCLUDED -#define W32_SVRAPI_H_VERSION "$Id: w32svrapi.h,v 1.3 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32svrapi.h,v $ diff --git a/w32taskbar.c b/w32taskbar.c index 27d45b4f..f57db110 100644 --- a/w32taskbar.c +++ b/w32taskbar.c @@ -1,4 +1,3 @@ -const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.13 2012/03/09 16:23:50 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $ @@ -46,8 +45,6 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.13 2012/03/09 16:23:50 fabi #include "w32res.h" #include "w32log.h" -const char w32taskbar_h_rcs[] = W32TASKBAR_H_VERSION; - #ifndef _WIN_CONSOLE /* entire file */ #define WM_TRAYMSG WM_USER+1 diff --git a/w32taskbar.h b/w32taskbar.h index 760eb2d2..f5d8b14e 100644 --- a/w32taskbar.h +++ b/w32taskbar.h @@ -1,6 +1,5 @@ #ifndef W32TASKBAR_H_INCLUDED #define W32TASKBAR_H_INCLUDED -#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.8 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32taskbar.h,v $ @@ -40,10 +39,6 @@ extern BOOL TrayAddIcon(HWND hwnd, UINT uID, HICON hicon, const char *pszToolTip extern BOOL TraySetIcon(HWND hwnd, UINT uID, HICON hicon); extern BOOL TrayDeleteIcon(HWND hwnd, UINT uID); -/* Revision control strings from this header and associated .c file */ -extern const char w32taskbar_rcs[]; -extern const char w32taskbar_h_rcs[]; - #endif /* ndef W32TASKBAR_H_INCLUDED */ diff --git a/win32.c b/win32.c index 9b08eb37..370d2b34 100644 --- a/win32.c +++ b/win32.c @@ -1,4 +1,3 @@ -const char win32_rcs[] = "$Id: win32.c,v 1.19 2012/03/09 16:23:50 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/win32.c,v $ @@ -60,8 +59,6 @@ const char win32_rcs[] = "$Id: win32.c,v 1.19 2012/03/09 16:23:50 fabiankeil Exp #include "win32.h" -const char win32_h_rcs[] = WIN32_H_VERSION; - /** * A short introductory text about Privoxy. Used for the "About" box * or the console startup message. diff --git a/win32.h b/win32.h index 9baeeadb..15a804e0 100644 --- a/win32.h +++ b/win32.h @@ -1,6 +1,5 @@ #ifndef WIN32_H_INCLUDED #define WIN32_H_INCLUDED -#define WIN32_H_VERSION "$Id: win32.h,v 1.9 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/win32.h,v $ @@ -47,10 +46,6 @@ extern int g_nCmdShow; extern int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow); -/* Revision control strings from this header and associated .c file */ -extern const char win32_rcs[]; -extern const char win32_h_rcs[]; - #endif /* ndef WIN32_H_INCLUDED */ /* -- 2.39.2