Commit 8f46dc03 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326,... 

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −20
Original line number Diff line number Diff line
@@ -109,26 +109,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) Fix some spurious and/or inconsistant indent spotted by sparse

     Fix some minor style issues.

     trunk: http://svn.apache.org/r1700317

            http://svn.apache.org/r1700318

            http://svn.apache.org/r1700319

            http://svn.apache.org/r1700320

            http://svn.apache.org/r1700321

            http://svn.apache.org/r1700322

            http://svn.apache.org/r1700326

            http://svn.apache.org/r1700328

            http://svn.apache.org/r1700330

            http://svn.apache.org/r1700331

            http://svn.apache.org/r1700332

            http://svn.apache.org/r1700334

            http://svn.apache.org/r1700336

            http://svn.apache.org/r1700338

     2.4.x: http://people.apache.org/~jailletc36/sparse.diff

     +1: jailletc36, ylavic, covener

     jailletc36: To ease review http://people.apache.org/~jailletc36/sparse_nospace.diff

                 is the same file as above but generated using svn diff -x --ignore-all-space





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/cache/mod_cache_disk.c

+8 −6
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static apr_status_t file_cache_el_final(disk_cache_conf *conf, disk_cache_file_t 
    return rv;

}



static apr_status_t file_cache_temp_cleanup(void *dummy) {

static apr_status_t file_cache_temp_cleanup(void *dummy)

{

    disk_cache_file_t *file = (disk_cache_file_t *)dummy;



    /* clean up the temporary file */
@@ -1382,7 +1383,8 @@ static void *create_dir_config(apr_pool_t *p, char *dummy) 
    return dconf;

}



static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {

static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv)

{

    disk_cache_dir_conf *new = (disk_cache_dir_conf *) apr_pcalloc(p, sizeof(disk_cache_dir_conf));

    disk_cache_dir_conf *add = (disk_cache_dir_conf *) addv;

    disk_cache_dir_conf *base = (disk_cache_dir_conf *) basev;

modules/cache/mod_cache_socache.c

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ static apr_status_t read_table(cache_handle_t *handle, request_rec *r, 
        apr_size_t *slider)

{

    apr_size_t key = *slider, colon = 0, len = 0;

    ;



    while (*slider < buffer_len) {

        if (buffer[*slider] == ':') {

modules/ldap/util_ldap.c

+12 −12
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ static apr_status_t uldap_connection_unbind(void *param) 
 *

 * The caller should hold the lock for this connection

 */

static apr_status_t util_ldap_connection_remove (void *param) {

static apr_status_t util_ldap_connection_remove (void *param)

{

    util_ldap_connection_t *ldc = param, *l = NULL, *prev = NULL;

    util_ldap_state_t *st;
@@ -2670,7 +2671,8 @@ static const char *util_ldap_set_referral_hop_limit(cmd_parms *cmd, 
    return NULL;

}



static void *util_ldap_create_dir_config(apr_pool_t *p, char *d) {

static void *util_ldap_create_dir_config(apr_pool_t *p, char *d)

{

    util_ldap_config_t *dc =

        (util_ldap_config_t *) apr_pcalloc(p,sizeof(util_ldap_config_t));
@@ -2891,7 +2893,6 @@ static void *util_ldap_merge_config(apr_pool_t *p, void *basev, 


static apr_status_t util_ldap_cleanup_module(void *data)

{



    server_rec *s = data;

    util_ldap_state_t *st = (util_ldap_state_t *)ap_get_module_config(

        s->module_config, &ldap_module);
@@ -2901,7 +2902,6 @@ static apr_status_t util_ldap_cleanup_module(void *data) 
    }



    return APR_SUCCESS;



}



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

modules/loggers/mod_log_config.c

+5 −4
Original line number Diff line number Diff line
@@ -1175,9 +1175,10 @@ static int config_log_transaction(request_rec *r, config_log_state *cls, 
        return HTTP_INTERNAL_SERVER_ERROR;

    }

    rv = log_writer(r, cls->log_writer, strs, strl, format->nelts, len);

    if (rv != APR_SUCCESS)

        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, APLOGNO(00646) "Error writing to %s",

                      cls->fname);

    if (rv != APR_SUCCESS) {

        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, APLOGNO(00646)

                      "Error writing to %s", cls->fname);

    }

    return OK;

}