Commit bbc1387c authored by Doug MacEachern's avatar Doug MacEachern
Browse files

renaming various functions for consistency sake 

see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
parent 86a78b40

include/ap_mmn.h

+11 −11
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
 *			  added limit_req_body to core_dir_config and

 *			  ap_get_limit_req_body() to get its value.

 * 19980812 (1.3.2-dev)	- split off MODULE_MAGIC_NUMBER

 * 19980812.2           - add apr_overlap_tables()

 * 19980812.2           - add apr_table_overlap()

 * 19980816 (1.3.2-dev)	- change proxy to use tables for headers, change

 *                        struct cache_req to typedef cache_req.

 *                        Delete ap_proxy_get_header(), ap_proxy_add_header(),
@@ -205,8 +205,8 @@ 
 *                      - reordered entries in request_rec that were waiting

 *                        for a non-binary-compatible release.

 *          (1.3.5-dev)

 * 19990108.1           - add apr_MD5Encode() for MD5 password handling.

 * 19990108.2           - add apr_validate_password() and change apr_MD5Encode()

 * 19990108.1           - add apr_md5_encode() for MD5 password handling.

 * 19990108.2           - add apr_password_validate() and change apr_md5_encode()

 *                        to use a stronger algorithm.

 * 19990108.4           - add ap_size_list_item(), ap_get_list_item(), and

 *                        ap_find_list_item()
@@ -221,11 +221,11 @@ 
 * 19990320.3           - add ap_regexec() and ap_regerror()

 * 19990320.4           - add ap_field_noparam()

 * 19990320.5           - add local_ip/host to conn_rec for mass-vhost

 * 19990320.6           - add apr_SHA1Final(), apr_SHA1Init(),

 *                        apr_SHA1Update_binary(), apr_SHA1Update(),

 *                        apr_base64encode(), apr_base64encode_binary(),

 *                        apr_base64encode_len(), apr_base64decode(),

 *                        apr_base64decode_binary(), apr_base64decode_len(),

 * 19990320.6           - add apr_sha1_final(), apr_sha1_init(),

 *                        apr_sha1_update_binary(), apr_sha1_update(),

 *                        apr_base64_encode(), apr_base64_encode_binary(),

 *                        apr_base64_encode_len(), apr_base64_decode(),

 *                        apr_base64_decode_binary(), apr_base64_decode_len(),

 *                        ap_pbase64decode(), ap_pbase64encode()

 */
@@ -242,13 +242,13 @@ 
 * specified value.

 * <PRE>

 * Useful for testing for features.

 * For example, suppose you wish to use the apr_overlap_tables

 * For example, suppose you wish to use the apr_table_overlap

 *    function.  You can do this:

 * 

 * #if MODULE_MAGIC_AT_LEAST(19980812,2)

 *     ... use apr_overlap_tables()

 *     ... use apr_table_overlap()

 * #else

 *     ... alternative code which doesn't use apr_overlap_tables()

 *     ... alternative code which doesn't use apr_table_overlap()

 * #endif

 * </PRE>

 * @param major The major module magic number

modules/aaa/mod_access.c

+3 −3
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ static void *create_access_dir_config(apr_pool_t *p, char *dummy) 


    for (i = 0; i < METHODS; ++i)

	conf->order[i] = DENY_THEN_ALLOW;

    conf->allows = apr_make_array(p, 1, sizeof(allowdeny));

    conf->denys = apr_make_array(p, 1, sizeof(allowdeny));

    conf->allows = apr_array_make(p, 1, sizeof(allowdeny));

    conf->denys = apr_array_make(p, 1, sizeof(allowdeny));



    return (void *) conf;

}
@@ -172,7 +172,7 @@ static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from, 
    if (strcasecmp(from, "from"))

	return "allow and deny must be followed by 'from'";



    a = (allowdeny *) apr_push_array(cmd->info ? d->allows : d->denys);

    a = (allowdeny *) apr_array_push(cmd->info ? d->allows : d->denys);

    a->x.from = where;

    a->limited = cmd->limited;

modules/aaa/mod_auth.c

+4 −4
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static char *get_pw(request_rec *r, char *user, char *auth_pwfile) 
static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile)

{

    configfile_t *f;

    apr_table_t *grps = apr_make_table(p, 15);

    apr_table_t *grps = apr_table_make(p, 15);

    apr_pool_t *sp;

    char l[MAX_STRING_LEN];

    const char *group_name, *ll, *w;
@@ -165,7 +165,7 @@ static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile) 
	return NULL;

    }



    apr_create_pool(&sp, p);

    apr_pool_create(&sp, p);



    while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {

	if ((l[0] == '#') || (!l[0]))
@@ -184,7 +184,7 @@ static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile) 
	}

    }

    ap_cfg_closefile(f);

    apr_destroy_pool(sp);

    apr_pool_destroy(sp);

    return grps;

}
@@ -225,7 +225,7 @@ static int authenticate_basic_user(request_rec *r) 
	ap_note_basic_auth_failure(r);

	return HTTP_UNAUTHORIZED;

    }

    invalid_pw = apr_validate_password(sent_pw, real_pw);

    invalid_pw = apr_password_validate(sent_pw, real_pw);

    if (invalid_pw != APR_SUCCESS) {

	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

		      "user %s: authentication failure for \"%s\": "

modules/aaa/mod_auth_db.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int db_authenticate_basic_user(request_rec *r) 
	*colon_pw = '\0';

    }



    invalid_pw = apr_validate_password(sent_pw, real_pw);

    invalid_pw = apr_password_validate(sent_pw, real_pw);



    if (invalid_pw != APR_SUCCESS) {

	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

modules/aaa/mod_auth_dbm.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int dbm_authenticate_basic_user(request_rec *r) 
    if (colon_pw) {

	*colon_pw = '\0';

    }

    invalid_pw = apr_validate_password(sent_pw, real_pw);

    invalid_pw = apr_password_validate(sent_pw, real_pw);

    if (invalid_pw != APR_SUCCESS) {

	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

		      "DBM user %s: authentication failure for \"%s\": "