Commit 9b44a4e7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581,... 

Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.
Add a blank line between functions.

Remove some useless 'return' statements.
Fix style and alignment.

Remove some useless 'return' statements.
Fix style.

Remove some useless 'return' statements.
Add a blank line between functions.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1722180 13f79535-47bb-0310-9956-ffa450edef68
parent df547a08

STATUS

+0 −15
Original line number Diff line number Diff line
@@ -112,21 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) Remove some useless return statements (+ some minor style changes)

     trunk patch: http://svn.apache.org/r1715567

                  http://svn.apache.org/r1715568

                  http://svn.apache.org/r1715570

                  http://svn.apache.org/r1715571

                  http://svn.apache.org/r1715572

                  http://svn.apache.org/r1715576

                  http://svn.apache.org/r1715581

                  http://svn.apache.org/r1715582

                  http://svn.apache.org/r1715583

                  http://svn.apache.org/r1715584

                  http://svn.apache.org/r1715585

     2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch

     +1: jailletc36, jim, covener



  *) mod_ssl: Fix "warning: variable 'hssc' set but not used".

              2.4.x only, r1715255 merged in 2.4.18 missed this (trunk) hunk.

     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ssl_hssc_warning.patch

modules/aaa/mod_authn_socache.c

+6 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static apr_status_t remove_lock(void *data) 
    }

    return APR_SUCCESS;

}



static apr_status_t destroy_cache(void *data)

{

    if (socache_instance) {
@@ -66,7 +67,6 @@ static apr_status_t destroy_cache(void *data) 
    return APR_SUCCESS;

}





static int authn_cache_precfg(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptmp)

{

    apr_status_t rv = ap_mutex_register(pconf, authn_cache_id,
@@ -82,6 +82,7 @@ static int authn_cache_precfg(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p 
    configured = 0;

    return OK;

}



static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog,

                                   apr_pool_t *ptmp, server_rec *s)

{
@@ -133,6 +134,7 @@ static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
    apr_pool_cleanup_register(pconf, (void*)s, destroy_cache, apr_pool_cleanup_null);

    return OK;

}



static void authn_cache_child_init(apr_pool_t *p, server_rec *s)

{

    const char *lock;
@@ -202,6 +204,7 @@ static void* authn_cache_dircfg_create(apr_pool_t *pool, char *s) 
    ret->context = directory;

    return ret;

}



/* not sure we want this.  Might be safer to document use-all-or-none */

static void* authn_cache_dircfg_merge(apr_pool_t *pool, void *BASE, void *ADD)

{
@@ -286,6 +289,7 @@ static const char *construct_key(request_rec *r, const char *context, 
        return apr_pstrcat(r->pool, context, ":", user, ":", realm, NULL);

    }

}



static void ap_authn_cache_store(request_rec *r, const char *module,

                                 const char *user, const char *realm,

                                 const char* data)
@@ -352,14 +356,12 @@ static void ap_authn_cache_store(request_rec *r, const char *module, 
    if (rv != APR_SUCCESS) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01683) "Failed to release mutex!");

    }

    return;

}



#define MAX_VAL_LEN 100

static authn_status check_password(request_rec *r, const char *user,

                                   const char *password)

{



    /* construct key

     * look it up

     * if found, test password
@@ -457,6 +459,7 @@ static const authn_provider authn_cache_provider = 
    &check_password,

    &get_realm_hash,

};



static void register_hooks(apr_pool_t *p)

{

    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "socache",

modules/cache/mod_socache_dbm.c

+0 −3
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ static void socache_dbm_destroy(ap_socache_instance_t *ctx, server_rec *s) 
    unlink(apr_pstrcat(ctx->pool, ctx->data_file, ".pag", NULL));

    unlink(apr_pstrcat(ctx->pool, ctx->data_file, ".db", NULL));

    unlink(ctx->data_file);



    return;

}



static apr_status_t socache_dbm_store(ap_socache_instance_t *ctx,
@@ -510,7 +508,6 @@ static void socache_dbm_status(ap_socache_instance_t *ctx, request_rec *r, 
        ap_rprintf(r, "CacheCurrentSize: %ld\n", size);

        ap_rprintf(r, "CacheAvgEntrySize: %d\n", avg);

    }

    return;

}



static apr_status_t socache_dbm_iterate(ap_socache_instance_t *ctx,

modules/dav/main/props.c

+0 −1
Original line number Diff line number Diff line
@@ -566,7 +566,6 @@ DAV_DECLARE(void) dav_close_propdb(dav_propdb *propdb) 
#if 0

    apr_pool_destroy(propdb->p);

#endif

    return;

}



DAV_DECLARE(dav_get_props_result) dav_get_allprops(dav_propdb *propdb,

modules/filters/mod_filter.c

+0 −2
Original line number Diff line number Diff line
@@ -670,8 +670,6 @@ static void filter_insert(request_rec *r) 
        }

#endif

    }



    return;

}



static void filter_hooks(apr_pool_t *pool)