Commit 073d8a67 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Improvements found by cppcheck: 

remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103459 13f79535-47bb-0310-9956-ffa450edef68
parent 17f5cbf0

modules/aaa/mod_auth_digest.c

+1 −2
Changes for modules/aaa/mod_auth_digest.c: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -1260,10 +1260,8 @@ static void note_digest_auth_failure(request_rec *r, 
                                     digest_header_rec *resp, int stale)

{

    const char   *qop, *opaque, *opaque_param, *domain, *nonce;

    int           cnt;



    /* Setup qop */



    if (conf->qop_list[0] == NULL) {

        qop = ", qop=\"auth\"";

    }
@@ -1271,6 +1269,7 @@ static void note_digest_auth_failure(request_rec *r, 
        qop = "";

    }

    else {

        int cnt;

        qop = apr_pstrcat(r->pool, ", qop=\"", conf->qop_list[0], NULL);

        for (cnt = 1; conf->qop_list[cnt] != NULL; cnt++) {

            qop = apr_pstrcat(r->pool, qop, ",", conf->qop_list[cnt], NULL);

modules/cache/mod_socache_shmcb.c

+2 −2
Changes for modules/cache/mod_socache_shmcb.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx, 
    server_rec *s = r->server;

    SHMCBHeader *header = ctx->header;

    unsigned int loop, total = 0, cache_total = 0, non_empty_subcaches = 0;

    apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0, average_expiry = 0;

    apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0;

    apr_time_t now = apr_time_now();

    double expiry_total = 0;

    int index_pct, cache_pct;
@@ -599,7 +599,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx, 
    ap_rprintf(r, "subcaches: <b>%d</b>, indexes per subcache: <b>%d</b><br>",

               header->subcache_num, header->index_num);

    if (non_empty_subcaches) {

        average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches);

        apr_time_t average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches);

        ap_rprintf(r, "time left on oldest entries' objects: ");

        if (now < average_expiry)

            ap_rprintf(r, "avg: <b>%d</b> seconds, (range: %d...%d)<br>",

modules/dav/main/mod_dav.c

+1 −1
Changes for modules/dav/main/mod_dav.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2342,7 +2342,7 @@ static int dav_method_proppatch(request_rec *r) 


        /* Ignore children that are not set/remove */

        if (child->ns != APR_XML_NS_DAV_ID

            || (!(is_remove = strcmp(child->name, "remove") == 0)

            || (!(is_remove = (strcmp(child->name, "remove") == 0))

                && strcmp(child->name, "set") != 0)) {

            continue;

        }

modules/debugging/mod_dumpio.c

+1 −2
Changes for modules/debugging/mod_dumpio.c: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -69,14 +69,13 @@ static void dumpit(ap_filter_t *f, apr_bucket *b, dumpio_conf_t *ptr) 
#endif

        const char *buf;

        apr_size_t nbytes;

        apr_size_t logbytes;

        apr_status_t rv = apr_bucket_read(b, &buf, &nbytes, APR_BLOCK_READ);



        if (rv == APR_SUCCESS)

        {

            while (nbytes)

            {

                logbytes = nbytes;

                apr_size_t logbytes = nbytes;

                if (logbytes > dumpio_MAX_STRING_LEN)

                    logbytes = dumpio_MAX_STRING_LEN;

                nbytes -= logbytes;

modules/filters/mod_filter.c

+1 −1
Changes for modules/filters/mod_filter.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ static int filter_lookup(ap_filter_t *f, ap_filter_rec_t *filter) 
    ap_filter_provider_t *provider;

    int match;

    const char *err = NULL;

    unsigned int proto_flags;

    request_rec *r = f->r;

    harness_ctx *ctx = f->ctx;

    provider_ctx *pctx;

#ifndef NO_PROTOCOL

    unsigned int proto_flags;

    mod_filter_ctx *rctx = ap_get_module_config(r->request_config,

                                                &filter_module);

#endif