Skip to content

Commit 9a56b17

Browse files
author
Cliff Woolley
committed
Renames:
 APR_XtOffset -> APR_OFFSET APR_XtOffsetOf -> APR_OFFSETOF git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95164 13f79535-47bb-0310-9956-ffa450edef68
1 parent 041e1bc commit 9a56b17

9 files changed

Lines changed: 56 additions & 56 deletions

File tree

‎modules/aaa/mod_auth.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ static const char *set_auth_slot(cmd_parms *cmd, void *offset, const char *f,
111111
static const command_rec auth_cmds[] =
112112
{
113113
AP_INIT_TAKE12("AuthUserFile", set_auth_slot,
114-
(void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile),
114+
(void *)APR_OFFSETOF(auth_config_rec, auth_pwfile),
115115
OR_AUTHCFG, "text file containing user IDs and passwords"),
116116
AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,
117-
(void *) APR_XtOffsetOf(auth_config_rec, auth_grpfile),
117+
(void *)APR_OFFSETOF(auth_config_rec, auth_grpfile),
118118
OR_AUTHCFG,
119119
"text file containing group names and member user IDs"),
120120
AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,
121-
(void *) APR_XtOffsetOf(auth_config_rec, auth_authoritative),
121+
(void *)APR_OFFSETOF(auth_config_rec, auth_authoritative),
122122
OR_AUTHCFG,
123123
"Set to 'no' to allow access control to be passed along to "
124124
"lower modules if the UserID is not known to this module"),

‎modules/aaa/mod_auth_anon.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,19 @@ static const command_rec anon_auth_cmds[] =
166166
AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG,
167167
"a space-separated list of user IDs"),
168168
AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,
169-
(void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_mustemail),
169+
(void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_mustemail),
170170
OR_AUTHCFG, "Limited to 'on' or 'off'"),
171171
AP_INIT_FLAG("Anonymous_NoUserId", ap_set_flag_slot,
172-
(void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_nouserid),
172+
(void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_nouserid),
173173
OR_AUTHCFG, "Limited to 'on' or 'off'"),
174174
AP_INIT_FLAG("Anonymous_VerifyEmail", ap_set_flag_slot,
175-
(void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_verifyemail),
175+
(void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_verifyemail),
176176
OR_AUTHCFG, "Limited to 'on' or 'off'"),
177177
AP_INIT_FLAG("Anonymous_LogEmail", ap_set_flag_slot,
178-
(void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_logemail),
178+
(void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_logemail),
179179
OR_AUTHCFG, "Limited to 'on' or 'off'"),
180180
AP_INIT_FLAG("Anonymous_Authoritative", ap_set_flag_slot,
181-
(void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_authoritative),
181+
(void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_authoritative),
182182
OR_AUTHCFG, "Limited to 'on' or 'off'"),
183183
{NULL}
184184
};

‎modules/aaa/mod_auth_dbm.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,22 @@ static const char *set_dbm_type(cmd_parms *cmd,
126126
static const command_rec dbm_auth_cmds[] =
127127
{
128128
AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
129-
(void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
129+
(void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
130130
OR_AUTHCFG, "dbm database file containing user IDs and passwords"),
131131
AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
132-
(void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
132+
(void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
133133
OR_AUTHCFG, "dbm database file containing group names and member user IDs"),
134134
AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,
135-
(void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
135+
(void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
136136
OR_AUTHCFG, NULL),
137137
AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
138-
(void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
138+
(void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
139139
OR_AUTHCFG, NULL),
140140
AP_INIT_TAKE1("AuthDBMType", set_dbm_type,
141141
NULL,
142142
OR_AUTHCFG, "what type of DBM file the user file is"),
143143
AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
144-
(void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
144+
(void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmauthoritative),
145145
OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"),
146146
{NULL}
147147
};

‎modules/arch/win32/mod_isapi.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,23 +207,23 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
207207

208208
static const command_rec isapi_cmds[] = {
209209
AP_INIT_TAKE1("ISAPIReadAheadBuffer", ap_set_int_slot,
210-
(void *) APR_XtOffsetOf(isapi_dir_conf, read_ahead_buflen),
210+
(void *)APR_OFFSETOF(isapi_dir_conf, read_ahead_buflen),
211211
OR_FILEINFO, "Maximum client request body to initially pass to the"
212212
" ISAPI handler (default: 48192)"),
213213
AP_INIT_FLAG("ISAPILogNotSupported", ap_set_int_slot,
214-
(void *) APR_XtOffsetOf(isapi_dir_conf, log_unsupported),
214+
(void *)APR_OFFSETOF(isapi_dir_conf, log_unsupported),
215215
OR_FILEINFO, "Log requests not supported by the ISAPI server"
216216
" on or off (default: off)"),
217217
AP_INIT_FLAG("ISAPIAppendLogToErrors", ap_set_flag_slot,
218-
(void *) APR_XtOffsetOf(isapi_dir_conf, log_to_errlog),
218+
(void *)APR_OFFSETOF(isapi_dir_conf, log_to_errlog),
219219
OR_FILEINFO, "Send all Append Log requests to the error log"
220220
" on or off (default: off)"),
221221
AP_INIT_FLAG("ISAPIAppendLogToQuery", ap_set_flag_slot,
222-
(void *) APR_XtOffsetOf(isapi_dir_conf, log_to_query),
222+
(void *)APR_OFFSETOF(isapi_dir_conf, log_to_query),
223223
OR_FILEINFO, "Append Log requests are concatinated to the query args"
224224
" on or off (default: on)"),
225225
AP_INIT_FLAG("ISAPIFakeAsync", ap_set_flag_slot,
226-
(void *) APR_XtOffsetOf(isapi_dir_conf, fake_async),
226+
(void *)APR_OFFSETOF(isapi_dir_conf, fake_async),
227227
OR_FILEINFO, "Fake Asynchronous support for isapi callbacks"
228228
" on or off [Experimental] (default: off)"),
229229
AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL,

‎modules/generators/mod_autoindex.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ static const command_rec autoindex_cmds[] =
585585
AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, NULL, OR_ALL,
586586
"The FancyIndexing directive is no longer supported. Use IndexOptions FancyIndexing."),
587587
AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
588-
(void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),
588+
(void *)APR_OFFSETOF(autoindex_config_rec, default_icon),
589589
DIR_CMD_PERMS, "an icon URL"),
590590
{NULL}
591591
};

‎modules/http/mod_mime.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -379,54 +379,54 @@ static const char *multiviews_match(cmd_parms *cmd, void *m_,
379379
static const command_rec mime_cmds[] =
380380
{
381381
AP_INIT_ITERATE2("AddCharset", add_extension_info,
382-
(void *)APR_XtOffsetOf(extension_info, charset_type), OR_FILEINFO,
382+
(void *)APR_OFFSETOF(extension_info, charset_type), OR_FILEINFO,
383383
"a charset (e.g., iso-2022-jp), followed by one or more "
384384
"file extensions"),
385385
AP_INIT_ITERATE2("AddEncoding", add_extension_info,
386-
(void *)APR_XtOffsetOf(extension_info, encoding_type), OR_FILEINFO,
386+
(void *)APR_OFFSETOF(extension_info, encoding_type), OR_FILEINFO,
387387
"an encoding (e.g., gzip), followed by one or more file extensions"),
388388
AP_INIT_ITERATE2("AddHandler", add_extension_info,
389-
(void *)APR_XtOffsetOf(extension_info, handler), OR_FILEINFO,
389+
(void *)APR_OFFSETOF(extension_info, handler), OR_FILEINFO,
390390
"a handler name followed by one or more file extensions"),
391391
AP_INIT_ITERATE2("AddInputFilter", add_extension_info,
392-
(void *)APR_XtOffsetOf(extension_info, input_filters), OR_FILEINFO,
392+
(void *)APR_OFFSETOF(extension_info, input_filters), OR_FILEINFO,
393393
"input filter name (or ; delimited names) followed by one or "
394394
"more file extensions"),
395395
AP_INIT_ITERATE2("AddLanguage", add_extension_info,
396-
(void *)APR_XtOffsetOf(extension_info, language_type), OR_FILEINFO,
396+
(void *)APR_OFFSETOF(extension_info, language_type), OR_FILEINFO,
397397
"a language (e.g., fr), followed by one or more file extensions"),
398398
AP_INIT_ITERATE2("AddOutputFilter", add_extension_info,
399-
(void *)APR_XtOffsetOf(extension_info, output_filters), OR_FILEINFO,
399+
(void *)APR_OFFSETOF(extension_info, output_filters), OR_FILEINFO,
400400
"output filter name (or ; delimited names) followed by one or "
401401
"more file extensions"),
402402
AP_INIT_ITERATE2("AddType", add_extension_info,
403-
(void *)APR_XtOffsetOf(extension_info, forced_type), OR_FILEINFO,
403+
(void *)APR_OFFSETOF(extension_info, forced_type), OR_FILEINFO,
404404
"a mime type followed by one or more file extensions"),
405405
AP_INIT_TAKE1("DefaultLanguage", ap_set_string_slot,
406-
(void*)APR_XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
406+
(void*)APR_OFFSETOF(mime_dir_config, default_language), OR_FILEINFO,
407407
"language to use for documents with no other language file extension"),
408408
AP_INIT_ITERATE("MultiviewsMatch", multiviews_match, NULL, OR_FILEINFO,
409409
"NegotiatedOnly (default), Handlers and/or Filters, or Any"),
410410
AP_INIT_ITERATE("RemoveCharset", remove_extension_info,
411-
(void *)APR_XtOffsetOf(extension_info, charset_type), OR_FILEINFO,
411+
(void *)APR_OFFSETOF(extension_info, charset_type), OR_FILEINFO,
412412
"one or more file extensions"),
413413
AP_INIT_ITERATE("RemoveEncoding", remove_extension_info,
414-
(void *)APR_XtOffsetOf(extension_info, encoding_type), OR_FILEINFO,
414+
(void *)APR_OFFSETOF(extension_info, encoding_type), OR_FILEINFO,
415415
"one or more file extensions"),
416416
AP_INIT_ITERATE("RemoveHandler", remove_extension_info,
417-
(void *)APR_XtOffsetOf(extension_info, handler), OR_FILEINFO,
417+
(void *)APR_OFFSETOF(extension_info, handler), OR_FILEINFO,
418418
"one or more file extensions"),
419419
AP_INIT_ITERATE("RemoveInputFilter", remove_extension_info,
420-
(void *)APR_XtOffsetOf(extension_info, input_filters), OR_FILEINFO,
420+
(void *)APR_OFFSETOF(extension_info, input_filters), OR_FILEINFO,
421421
"one or more file extensions"),
422422
AP_INIT_ITERATE("RemoveLanguage", remove_extension_info,
423-
(void *)APR_XtOffsetOf(extension_info, language_type), OR_FILEINFO,
423+
(void *)APR_OFFSETOF(extension_info, language_type), OR_FILEINFO,
424424
"one or more file extensions"),
425425
AP_INIT_ITERATE("RemoveOutputFilter", remove_extension_info,
426-
(void *)APR_XtOffsetOf(extension_info, output_filters), OR_FILEINFO,
426+
(void *)APR_OFFSETOF(extension_info, output_filters), OR_FILEINFO,
427427
"one or more file extensions"),
428428
AP_INIT_ITERATE("RemoveType", remove_extension_info,
429-
(void *)APR_XtOffsetOf(extension_info, forced_type), OR_FILEINFO,
429+
(void *)APR_OFFSETOF(extension_info, forced_type), OR_FILEINFO,
430430
"one or more file extensions"),
431431
AP_INIT_TAKE1("TypesConfig", set_types_config, NULL, RSRC_CONF,
432432
"the MIME types config file"),

‎modules/mappers/mod_imap.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ static void *merge_imap_dir_configs(apr_pool_t *p, void *basev, void *addv)
163163
static const command_rec imap_cmds[] =
164164
{
165165
AP_INIT_TAKE1("ImapMenu", ap_set_string_slot,
166-
(void *) APR_XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES,
166+
(void *)APR_OFFSETOF(imap_conf_rec, imap_menu), OR_INDEXES,
167167
"the type of menu generated: none, formatted, semiformatted, "
168168
"unformatted"),
169169
AP_INIT_TAKE1("ImapDefault", ap_set_string_slot,
170-
(void *) APR_XtOffsetOf(imap_conf_rec, imap_default), OR_INDEXES,
170+
(void *)APR_OFFSETOF(imap_conf_rec, imap_default), OR_INDEXES,
171171
"the action taken if no match: error, nocontent, referer, "
172172
"menu, URL"),
173173
AP_INIT_TAKE1("ImapBase", ap_set_string_slot,
174-
(void *) APR_XtOffsetOf(imap_conf_rec, imap_base), OR_INDEXES,
174+
(void *)APR_OFFSETOF(imap_conf_rec, imap_base), OR_INDEXES,
175175
"the base for all URL's: map, referer, URL (or start of)"),
176176
{NULL}
177177
};

‎modules/metadata/mod_unique_id.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
#define APR_WANT_BYTEFUNC /* for htons() et al */
6767
#include "apr_want.h"
68-
#include "apr_general.h" /* for APR_XtOffsetOf */
68+
#include "apr_general.h" /* for APR_OFFSETOF */
6969
#include "apr_network_io.h"
7070

7171
#include "httpd.h"
@@ -183,15 +183,15 @@ static int unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pt
183183
/*
184184
* Calculate the sizes and offsets in cur_unique_id.
185185
*/
186-
unique_id_rec_offset[0] = APR_XtOffsetOf(unique_id_rec, stamp);
186+
unique_id_rec_offset[0] = APR_OFFSETOF(unique_id_rec, stamp);
187187
unique_id_rec_size[0] = sizeof(cur_unique_id.stamp);
188-
unique_id_rec_offset[1] = APR_XtOffsetOf(unique_id_rec, in_addr);
188+
unique_id_rec_offset[1] = APR_OFFSETOF(unique_id_rec, in_addr);
189189
unique_id_rec_size[1] = sizeof(cur_unique_id.in_addr);
190-
unique_id_rec_offset[2] = APR_XtOffsetOf(unique_id_rec, pid);
190+
unique_id_rec_offset[2] = APR_OFFSETOF(unique_id_rec, pid);
191191
unique_id_rec_size[2] = sizeof(cur_unique_id.pid);
192-
unique_id_rec_offset[3] = APR_XtOffsetOf(unique_id_rec, counter);
192+
unique_id_rec_offset[3] = APR_OFFSETOF(unique_id_rec, counter);
193193
unique_id_rec_size[3] = sizeof(cur_unique_id.counter);
194-
unique_id_rec_offset[4] = APR_XtOffsetOf(unique_id_rec, thread_index);
194+
unique_id_rec_offset[4] = APR_OFFSETOF(unique_id_rec, thread_index);
195195
unique_id_rec_size[4] = sizeof(cur_unique_id.thread_index);
196196
unique_id_rec_total_size = unique_id_rec_size[0] + unique_id_rec_size[1] +
197197
unique_id_rec_size[2] + unique_id_rec_size[3] +

‎server/core.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2865,7 +2865,7 @@ AP_INIT_RAW_ARGS("<LocationMatch", urlsection, (void*)1, RSRC_CONF,
28652865
AP_INIT_RAW_ARGS("<FilesMatch", filesection, (void*)1, OR_ALL,
28662866
"Container for directives affecting files matching specified patterns"),
28672867
AP_INIT_TAKE1("AuthType", ap_set_string_slot,
2868-
(void*)APR_XtOffsetOf(core_dir_config, ap_auth_type), OR_AUTHCFG,
2868+
(void*)APR_OFFSETOF(core_dir_config, ap_auth_type), OR_AUTHCFG,
28692869
"An HTTP authorization type (e.g., \"Basic\")"),
28702870
AP_INIT_TAKE1("AuthName", set_authname, NULL, OR_AUTHCFG,
28712871
"The authentication realm (e.g. \"Members Only\")"),
@@ -2896,7 +2896,7 @@ AP_INIT_RAW_ARGS("AllowOverride", set_override, NULL, ACCESS_CONF,
28962896
AP_INIT_RAW_ARGS("Options", set_options, NULL, OR_OPTIONS,
28972897
"Set a number of attributes for a given directory"),
28982898
AP_INIT_TAKE1("DefaultType", ap_set_string_slot,
2899-
(void*)APR_XtOffsetOf (core_dir_config, ap_default_type),
2899+
(void*)APR_OFFSETOF(core_dir_config, ap_default_type),
29002900
OR_FILEINFO, "the default MIME type for untypable files"),
29012901
AP_INIT_RAW_ARGS("FileETag", set_etag_bits, NULL, OR_FILEINFO,
29022902
"Specify components used to construct a file's ETag"),
@@ -2912,7 +2912,7 @@ AP_INIT_TAKE1("HostnameLookups", set_hostname_lookups, NULL,
29122912
"\"on\" to enable, \"off\" to disable reverse DNS lookups, or \"double\" to "
29132913
"enable double-reverse DNS lookups"),
29142914
AP_INIT_TAKE1("ServerAdmin", set_server_string_slot,
2915-
(void *)APR_XtOffsetOf (server_rec, server_admin), RSRC_CONF,
2915+
(void *)APR_OFFSETOF(server_rec, server_admin), RSRC_CONF,
29162916
"The email address of the server administrator"),
29172917
AP_INIT_TAKE1("ServerName", server_hostname_port, NULL, RSRC_CONF,
29182918
"The hostname and port of the server"),
@@ -2921,7 +2921,7 @@ AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL,
29212921
AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF | EXEC_ON_READ,
29222922
"Common directory of server-related files (logs, confs, etc.)"),
29232923
AP_INIT_TAKE1("ErrorLog", set_server_string_slot,
2924-
(void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF | EXEC_ON_READ,
2924+
(void *)APR_OFFSETOF(server_rec, error_fname), RSRC_CONF | EXEC_ON_READ,
29252925
"The filename of the error log"),
29262926
AP_INIT_RAW_ARGS("ServerAlias", set_server_alias, NULL, RSRC_CONF,
29272927
"A name or names alternately used to access the server"),
@@ -2959,7 +2959,7 @@ AP_INIT_TAKE1("LimitRequestFieldsize", set_limit_req_fieldsize, NULL,
29592959
AP_INIT_TAKE1("LimitRequestFields", set_limit_req_fields, NULL, RSRC_CONF,
29602960
"Limit (0 = unlimited) on max number of header fields in a request message"),
29612961
AP_INIT_TAKE1("LimitRequestBody", set_limit_req_body,
2962-
(void*)APR_XtOffsetOf(core_dir_config, limit_req_body), OR_ALL,
2962+
(void*)APR_OFFSETOF(core_dir_config, limit_req_body), OR_ALL,
29632963
"Limit (in bytes) on maximum size of request message body"),
29642964
AP_INIT_TAKE1("LimitXMLRequestBody", set_limit_xml_req_body, NULL, OR_ALL,
29652965
"Limit (in bytes) on maximum size of an XML-based request "
@@ -2968,43 +2968,43 @@ AP_INIT_TAKE1("LimitXMLRequestBody", set_limit_xml_req_body, NULL, OR_ALL,
29682968
/* System Resource Controls */
29692969
#ifdef RLIMIT_CPU
29702970
AP_INIT_TAKE12("RLimitCPU", set_limit_cpu,
2971-
(void*)APR_XtOffsetOf(core_dir_config, limit_cpu),
2971+
(void*)APR_OFFSETOF(core_dir_config, limit_cpu),
29722972
OR_ALL, "Soft/hard limits for max CPU usage in seconds"),
29732973
#else
29742974
AP_INIT_TAKE12("RLimitCPU", no_set_limit, NULL,
29752975
OR_ALL, "Soft/hard limits for max CPU usage in seconds"),
29762976
#endif
29772977
#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined (RLIMIT_AS)
29782978
AP_INIT_TAKE12("RLimitMEM", set_limit_mem,
2979-
(void*)APR_XtOffsetOf(core_dir_config, limit_mem),
2979+
(void*)APR_OFFSETOF(core_dir_config, limit_mem),
29802980
OR_ALL, "Soft/hard limits for max memory usage per process"),
29812981
#else
29822982
AP_INIT_TAKE12("RLimitMEM", no_set_limit, NULL,
29832983
OR_ALL, "Soft/hard limits for max memory usage per process"),
29842984
#endif
29852985
#ifdef RLIMIT_NPROC
29862986
AP_INIT_TAKE12("RLimitNPROC", set_limit_nproc,
2987-
(void*)APR_XtOffsetOf(core_dir_config, limit_nproc),
2987+
(void*)APR_OFFSETOF(core_dir_config, limit_nproc),
29882988
OR_ALL, "soft/hard limits for max number of processes per uid"),
29892989
#else
29902990
AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,
29912991
OR_ALL, "soft/hard limits for max number of processes per uid"),
29922992
#endif
29932993

29942994
AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower,
2995-
(void *)APR_XtOffsetOf(core_dir_config, mime_type), OR_FILEINFO,
2995+
(void *)APR_OFFSETOF(core_dir_config, mime_type), OR_FILEINFO,
29962996
"a mime type that overrides other configured type"),
29972997
AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower,
2998-
(void *)APR_XtOffsetOf(core_dir_config, handler), OR_FILEINFO,
2998+
(void *)APR_OFFSETOF(core_dir_config, handler), OR_FILEINFO,
29992999
"a handler name that overrides any other configured handler"),
30003000
AP_INIT_TAKE1("SetOutputFilter", ap_set_string_slot,
3001-
(void *)APR_XtOffsetOf(core_dir_config, output_filters), OR_FILEINFO,
3001+
(void *)APR_OFFSETOF(core_dir_config, output_filters), OR_FILEINFO,
30023002
"filter (or ; delimited list of filters) to be run on the request content"),
30033003
AP_INIT_TAKE1("SetInputFilter", ap_set_string_slot,
3004-
(void *)APR_XtOffsetOf(core_dir_config, input_filters), OR_FILEINFO,
3004+
(void *)APR_OFFSETOF(core_dir_config, input_filters), OR_FILEINFO,
30053005
"filter (or ; delimited list of filters) to be run on the request body"),
30063006
AP_INIT_ITERATE2("AddOutputFilterByType", add_ct_output_filters,
3007-
(void *)APR_XtOffsetOf(core_dir_config, ct_output_filters), OR_FILEINFO,
3007+
(void *)APR_OFFSETOF(core_dir_config, ct_output_filters), OR_FILEINFO,
30083008
"output filter name followed by one or more content-types"),
30093009

30103010
/*

0 commit comments

Comments
 (0)