cvs commit: apache-1.3/src/include hide.h
dgaudet 98/03/17 00:22:41 Modified:src/include hide.h Log: to go with the cleanup Revision ChangesPath 1.13 +0 -10 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- hide.h1998/03/17 07:54:11 1.12 +++ hide.h1998/03/17 08:22:40 1.13 @@ -78,27 +78,20 @@ #define daemons_to_start AP_daemons_to_start #define excess_requests_per_child AP_excess_requests_per_child #define group_id AP_group_id -#define jmpbuffer AP_jmpbuffer #define listenbacklog AP_listenbacklog #define listeners AP_listeners #define lock_fname AP_lock_fname #define max_requests_per_child AP_max_requests_per_child -#define my_pid AP_my_pid -#define permanent_pool AP_permanent_pool -#define pgrp AP_pgrp #define pid_fname AP_pid_fname #define restart_time AP_restart_time #define scoreboard_fname AP_scoreboard_fname -#define sd AP_sd #define server_argv0 AP_server_argv0 -#define server_confAP_server_conf #define server_confnameAP_server_confname #define server_post_read_configAP_server_post_read_config #define server_pre_read_config AP_server_pre_read_config #define server_rootAP_server_root #define standalone AP_standalone #define threads_per_child AP_threads_per_child -#define timebufAP_timebuf #define user_idAP_user_id #define user_name AP_user_name @@ -212,7 +205,6 @@ #define clear_module_list AP_clear_module_list #define clear_pool AP_clear_pool #define clear_tableAP_clear_table -#define client_to_stdout AP_client_to_stdout #define close_piped_logAP_close_piped_log #define construct_server AP_construct_server #define construct_url AP_construct_url @@ -221,11 +213,9 @@ #define copy_table AP_copy_table #define core_reorder_directories AP_core_reorder_directories #define count_dirs AP_count_dirs -#define create_empty_configAP_create_empty_config #define create_environment AP_create_environment #define create_per_dir_config AP_create_per_dir_config #define create_request_config AP_create_request_config -#define default_handlerAP_default_handler #define default_port_for_request AP_default_port_for_request #define default_port_for_schemeAP_default_port_for_scheme #define default_type AP_default_type
cvs commit: apache-1.3/src/include hide.h
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
Submitted by: Ben Hyde
Revision ChangesPath
1.167 +82 -52apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- http_core.c 1998/03/13 13:28:16 1.166
+++ http_core.c 1998/03/13 16:49:41 1.167
@@ -683,7 +683,7 @@
return NULL;
}
-const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -695,7 +695,7 @@
return NULL;
}
-const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -716,7 +716,7 @@
return NULL;
}
-const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
+static const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
char *line)
{
int error_number, index_number, idx500;
@@ -759,7 +759,7 @@
* discards as harmless. Cheesy, but it works.
*/
-const char *set_override (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_override (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
char *w;
@@ -793,7 +793,7 @@
return NULL;
}
-const char *set_options (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_options (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
allow_options_t opt;
int first = 1;
@@ -876,7 +876,7 @@
return NULL;
}
-const char *limit_section (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *limit_section (cmd_parms *cmd, void *dummy, const char
*arg)
{
const char *limited_methods = getword(cmd-pool,arg,'');
int limited = 0;
@@ -904,7 +904,7 @@
return NULL;
}
-const char *endlimit_section (cmd_parms *cmd, void *dummy, void *dummy2)
+static const char *endlimit_section (cmd_parms *cmd, void *dummy, void
*dummy2)
{
if (cmd-limited == -1) return /Limit unexpected;
@@ -953,7 +953,7 @@
return cmd-end_token;
}
-const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1014,7 +1014,7 @@
return NULL;
}
-const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1070,7 +1070,7 @@
return NULL;
}
-const char *filesection (cmd_parms *cmd, core_dir_config *c, const char *arg)
+static const char *filesection (cmd_parms *cmd, core_dir_config *c, const
char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1137,11 +1137,11 @@
* Extra (redundant, unpaired) /IfModule directives are
* simply silently ignored.
*/
-const char *end_ifmod (cmd_parms *cmd, void *dummy) {
+static const char *end_ifmod (cmd_parms *cmd, void *dummy) {
return NULL;
}
-const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
+static const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
{
char *endp = strrchr (arg, '');
char l[MAX_STRING_LEN];
@@ -1173,7 +1173,7 @@
/* httpd.conf commands... beginning with the VirtualHost business */
-const char *virtualhost_section (cmd_parms *cmd, void *dummy, char *arg)
+static const char *virtualhost_section (cmd_parms *cmd, void *dummy, char
*arg)
{
server_rec *main_server = cmd-server, *s;
const char *errmsg;
@@ -1222,7 +1222,7 @@
return errmsg;
}
-const char *set_server_alias(cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_server_alias(cmd_parms *cmd, void *dummy, const char
*arg)
{
if (!cmd-server-names)
return ServerAlias only used in VirtualHost;
@@ -1237,7 +1237,7 @@
return NULL;
}
-const char *add_module_command (cmd_parms *cmd, void *dummy, char *arg)
+static const char *add_module_command (cmd_parms *cmd, void *dummy, char
*arg)
{
const char *err = check_cmd_context(cmd,
Re: cvs commit: apache-1.3/src/include hide.h
Ralf S. Engelschall wrote:
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
[snip]
-const char *set_server_string_slot (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_server_string_slot (cmd_parms *cmd, void *dummy,
+char *arg)
{
/* This one's pretty generic... */
This one should be part of the API (even if no-one does use it - they
should!)
Cheers,
Ben.
--
Ben Laurie|Phone: +44 (181) 735 0686| Apache Group member
Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org
and Technical Director|Email: [EMAIL PROTECTED] |
A.L. Digital Ltd, |Apache-SSL authorhttp://www.apache-ssl.org/
London, England. |Apache: TDG http://www.ora.com/catalog/apache
cvs commit: apache-1.3/src/include hide.h
rse 98/03/12 05:52:06
Modified:src/helpers UpdateHide
src/include hide.h
Log:
Fix UpdateHide: the log_error matches aplog_error in our
exclusion list because we have forgotten to bind the regex
to its boundaries.
Revision ChangesPath
1.7 +1 -1 apache-1.3/src/helpers/UpdateHide
Index: UpdateHide
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpdateHide1998/03/04 12:48:12 1.6
+++ UpdateHide1998/03/12 13:52:05 1.7
@@ -141,7 +141,7 @@
# skip any compiler- or system-private symbols
next if ($name !~ m|^[a-zA-Z]+|);
# skip any symbols in our exclusion list
-next if (grep(/$name/, @excluded));
+next if (grep(/^$name$/, @excluded));
# insert the symbol into our lists
$SB{$name}++ if $type eq 'B';
1.7 +1 -0 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hide.h1998/03/12 10:35:05 1.6
+++ hide.h1998/03/12 13:52:06 1.7
@@ -347,6 +347,7 @@
#define limit_section AP_limit_section
#define location_walk AP_location_walk
#define log_assert AP_log_assert
+#define log_error AP_log_error
#define log_pidAP_log_pid
#define log_printf AP_log_printf
#define log_reason AP_log_reason
cvs commit: apache-1.3/src/include hide.h
dgaudet 98/03/04 01:48:39 Modified:src/include hide.h Log: A few updates. Revision ChangesPath 1.3 +4 -3 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hide.h1998/03/03 13:47:41 1.2 +++ hide.h1998/03/04 09:48:38 1.3 @@ -121,6 +121,7 @@ #define core_cmds AP_core_cmds #define core_handlers AP_core_handlers #define core_moduleAP_core_module +#define day_snames AP_day_snames #define db_auth_module AP_db_auth_module #define dbm_auth_moduleAP_dbm_auth_module #define default_parms AP_default_parms @@ -138,6 +139,7 @@ #define info_moduleAP_info_module #define mime_magic_module AP_mime_magic_module #define mime_moduleAP_mime_module +#define month_snames AP_month_snames #define negotiation_module AP_negotiation_module #define one_processAP_one_process #define prelinked_modules AP_prelinked_modules @@ -167,7 +169,6 @@ #define MD5Final AP_MD5Final #define MD5InitAP_MD5Init #define MD5Update AP_MD5Update -#define SERVER_BUILT AP_SERVER_BUILT #define add_cgi_vars AP_add_cgi_vars #define add_common_varsAP_add_common_vars #define add_file_conf AP_add_file_conf @@ -188,6 +189,8 @@ #define ap_slack AP_ap_slack #define ap_snprintfAP_ap_snprintf #define ap_vsnprintf AP_ap_vsnprintf +#define apapi_get_server_built AP_apapi_get_server_built +#define apapi_get_server_version AP_apapi_get_server_version #define aplog_errorAP_aplog_error #define append_arrays AP_append_arrays #define array_cat AP_array_cat @@ -378,7 +381,6 @@ #define merge_per_dir_configs AP_merge_per_dir_configs #define merge_server_configs AP_merge_server_configs #define mime_find_ct AP_mime_find_ct -#define month_snames AP_month_snames #define new_block AP_new_block #define no2slash AP_no2slash #define note_auth_failure AP_note_auth_failure @@ -415,7 +417,6 @@ #define plustospaceAP_plustospace #define popendir AP_popendir #define popenf AP_popenf -#define pr2six AP_pr2six #define pregcomp AP_pregcomp #define pregfree AP_pregfree #define pregsubAP_pregsub
cvs commit: apache-1.3/src/include hide.h
coar98/03/04 04:02:09 Modified:src/helpers UpdateHide src/include hide.h Log: No, no, no - don't hide symbols which have already been given collision insurance. Revision ChangesPath 1.5 +3 -0 apache-1.3/src/helpers/UpdateHide Index: UpdateHide === RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- UpdateHide1998/03/04 09:57:26 1.4 +++ UpdateHide1998/03/04 12:02:07 1.5 @@ -19,6 +19,7 @@ dlclose dlerror dlopen dlsym start end atexit exit etext edata regcomp regerror regexec regfree +aplog_error ); @included = qw( D:db_auth_module @@ -74,6 +75,8 @@ # (when running this script while httpd was #already compiled with HIDE defined) $name =~ s|^AP_||; +# skip any already-protected symbols +next if ($name =~ m:^ap(_)|(api):); # skip any compiler- or system-private symbols next if ($name !~ m|^[a-zA-Z]+|); # skip any symbols in our exclusion list 1.5 +0 -13 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hide.h1998/03/04 09:57:28 1.4 +++ hide.h1998/03/04 12:02:08 1.5 @@ -179,19 +179,6 @@ #define add_per_url_conf AP_add_per_url_conf #define allow_options AP_allow_options #define allow_overridesAP_allow_overrides -#define ap__new_connection AP_ap__new_connection -#define ap_cpystrn AP_ap_cpystrn -#define ap_escape_quotes AP_ap_escape_quotes -#define ap_md5 AP_ap_md5 -#define ap_md5contextTo64 AP_ap_md5contextTo64 -#define ap_md5digest AP_ap_md5digest -#define ap_signal AP_ap_signal -#define ap_slack AP_ap_slack -#define ap_snprintfAP_ap_snprintf -#define ap_vsnprintf AP_ap_vsnprintf -#define apapi_get_server_built AP_apapi_get_server_built -#define apapi_get_server_version AP_apapi_get_server_version -#define aplog_errorAP_aplog_error #define append_arrays AP_append_arrays #define array_cat AP_array_cat #define auth_name AP_auth_name
