Commit 9a56b173 authored by Cliff Woolley's avatar Cliff Woolley
Browse files

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
parent 041e1bc6

modules/aaa/mod_auth.c

+3 −3
Changes for modules/aaa/mod_auth.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -111,14 +111,14 @@ static const char *set_auth_slot(cmd_parms *cmd, void *offset, const char *f, 
static const command_rec auth_cmds[] =

{

    AP_INIT_TAKE12("AuthUserFile", set_auth_slot,

                   (void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile),

                   (void *)APR_OFFSETOF(auth_config_rec, auth_pwfile),

                   OR_AUTHCFG, "text file containing user IDs and passwords"),

    AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,

                   (void *) APR_XtOffsetOf(auth_config_rec, auth_grpfile),

                   (void *)APR_OFFSETOF(auth_config_rec, auth_grpfile),

                   OR_AUTHCFG,

                   "text file containing group names and member user IDs"),

    AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,

                 (void *) APR_XtOffsetOf(auth_config_rec, auth_authoritative),

                 (void *)APR_OFFSETOF(auth_config_rec, auth_authoritative),

                 OR_AUTHCFG,

                 "Set to 'no' to allow access control to be passed along to "

                 "lower modules if the UserID is not known to this module"),

modules/aaa/mod_auth_anon.c

+5 −5
Changes for modules/aaa/mod_auth_anon.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -166,19 +166,19 @@ static const command_rec anon_auth_cmds[] = 
    AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, 

     "a space-separated list of user IDs"),

    AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,

     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_mustemail),

     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_mustemail),

     OR_AUTHCFG, "Limited to 'on' or 'off'"),

    AP_INIT_FLAG("Anonymous_NoUserId", ap_set_flag_slot,

     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_nouserid),

     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_nouserid),

     OR_AUTHCFG, "Limited to 'on' or 'off'"),

    AP_INIT_FLAG("Anonymous_VerifyEmail", ap_set_flag_slot,

     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_verifyemail),

     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_verifyemail),

     OR_AUTHCFG, "Limited to 'on' or 'off'"),

    AP_INIT_FLAG("Anonymous_LogEmail", ap_set_flag_slot,

     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_logemail),

     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_logemail),

     OR_AUTHCFG, "Limited to 'on' or 'off'"),

    AP_INIT_FLAG("Anonymous_Authoritative", ap_set_flag_slot,

     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_authoritative),

     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_authoritative),

     OR_AUTHCFG, "Limited to 'on' or 'off'"),

    {NULL}

};

modules/aaa/mod_auth_dbm.c

+5 −5
Changes for modules/aaa/mod_auth_dbm.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -126,22 +126,22 @@ static const char *set_dbm_type(cmd_parms *cmd, 
static const command_rec dbm_auth_cmds[] =

{

    AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),

     OR_AUTHCFG, "dbm database file containing user IDs and passwords"),

    AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),

     OR_AUTHCFG, "dbm database file containing group names and member user IDs"),

    AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),

     OR_AUTHCFG, NULL),

    AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),

     OR_AUTHCFG, NULL),

    AP_INIT_TAKE1("AuthDBMType", set_dbm_type,

     NULL,

     OR_AUTHCFG, "what type of DBM file the user file is"),

    AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),

     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmauthoritative),

     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"),

    {NULL}

};

modules/arch/win32/mod_isapi.c

+5 −5
Changes for modules/arch/win32/mod_isapi.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -207,23 +207,23 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy, 


static const command_rec isapi_cmds[] = {

    AP_INIT_TAKE1("ISAPIReadAheadBuffer", ap_set_int_slot,

        (void *) APR_XtOffsetOf(isapi_dir_conf, read_ahead_buflen), 

        (void *)APR_OFFSETOF(isapi_dir_conf, read_ahead_buflen), 

        OR_FILEINFO, "Maximum client request body to initially pass to the"

                     " ISAPI handler (default: 48192)"),

    AP_INIT_FLAG("ISAPILogNotSupported", ap_set_int_slot,

        (void *) APR_XtOffsetOf(isapi_dir_conf, log_unsupported), 

        (void *)APR_OFFSETOF(isapi_dir_conf, log_unsupported), 

        OR_FILEINFO, "Log requests not supported by the ISAPI server"

                     " on or off (default: off)"),

    AP_INIT_FLAG("ISAPIAppendLogToErrors", ap_set_flag_slot,

        (void *) APR_XtOffsetOf(isapi_dir_conf, log_to_errlog), 

        (void *)APR_OFFSETOF(isapi_dir_conf, log_to_errlog), 

        OR_FILEINFO, "Send all Append Log requests to the error log"

                     " on or off (default: off)"),

    AP_INIT_FLAG("ISAPIAppendLogToQuery", ap_set_flag_slot,

        (void *) APR_XtOffsetOf(isapi_dir_conf, log_to_query), 

        (void *)APR_OFFSETOF(isapi_dir_conf, log_to_query), 

        OR_FILEINFO, "Append Log requests are concatinated to the query args"

                     " on or off (default: on)"),

    AP_INIT_FLAG("ISAPIFakeAsync", ap_set_flag_slot,

        (void *) APR_XtOffsetOf(isapi_dir_conf, fake_async), 

        (void *)APR_OFFSETOF(isapi_dir_conf, fake_async), 

        OR_FILEINFO, "Fake Asynchronous support for isapi callbacks"

                     " on or off [Experimental] (default: off)"),

    AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL,

modules/generators/mod_autoindex.c

+1 −1
Changes for modules/generators/mod_autoindex.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static const command_rec autoindex_cmds[] = 
    AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, NULL, OR_ALL,

                 "The FancyIndexing directive is no longer supported.  Use IndexOptions FancyIndexing."),

    AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,

                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),

                  (void *)APR_OFFSETOF(autoindex_config_rec, default_icon),

                  DIR_CMD_PERMS, "an icon URL"),

    {NULL}

};