Commit 37c9c780 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

fix some dead assignments found by the clang analyzer 


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

modules/cluster/mod_heartmonitor.c

+3 −2
Changes for modules/cluster/mod_heartmonitor.c: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -252,8 +252,9 @@ static apr_status_t hm_file_update_stat(hm_ctx_t *ctx, hm_server_t *s, apr_pool_ 
        char *t;

        apr_table_t *hbt = apr_table_make(pool, 10);

        apr_bucket_alloc_t *ba = apr_bucket_alloc_create(pool);

        apr_bucket_brigade *bb = apr_brigade_create(pool, ba);

        apr_bucket_brigade *tmpbb = apr_brigade_create(pool, ba);

        apr_bucket_brigade *bb;

        apr_bucket_brigade *tmpbb;



        rv = apr_file_info_get(&fi, APR_FINFO_SIZE | APR_FINFO_MTIME, fpin);

        if (rv) {

            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ctx->s,

modules/filters/mod_deflate.c

+1 −1
Changes for modules/filters/mod_deflate.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, 
                /* skip parameters, XXX: ;q=foo evaluation? */

                while (*accepts == ';') {

                    ++accepts;

                    token = ap_get_token(r->pool, &accepts, 1);

                    ap_get_token(r->pool, &accepts, 1);

                }



                /* retrieve next token */

modules/generators/mod_autoindex.c

+0 −4
Changes for modules/generators/mod_autoindex.c: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -1504,7 +1504,6 @@ static void output_directories(struct ent **ar, int n, 
{

    int x;

    apr_size_t rv;

    char *name = r->uri;

    char *tp;

    int static_columns = !!(autoindex_opts & SUPPRESS_COLSORT);

    apr_pool_t *scratch;
@@ -1515,9 +1514,6 @@ static void output_directories(struct ent **ar, int n, 
    char *breakrow = "";



    apr_pool_create(&scratch, r->pool);

    if (name[0] == '\0') {

        name = "/";

    }



    name_width = d->name_width;

    desc_width = d->desc_width;

modules/generators/mod_cgid.c

+0 −7
Changes for modules/generators/mod_cgid.c: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1444,13 +1444,6 @@ static int cgid_handler(request_rec *r) 
    apr_os_pipe_put_ex(&tempsock, &sd, 1, r->pool);

    apr_pool_cleanup_kill(r->pool, (void *)((long)sd), close_unix_socket);



    if ((argv0 = strrchr(r->filename, '/')) != NULL) {

        argv0++;

    }

    else {

        argv0 = r->filename;

    }



    /* Transfer any put/post args, CERN style...

     * Note that we already ignore SIGPIPE in the core server.

     */

modules/mappers/mod_negotiation.c

+0 −1
Changes for modules/mappers/mod_negotiation.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1583,7 +1583,6 @@ static void set_language_quality(negotiation_state *neg, var_rec *variant) 
                p = NULL;

                bestthistag = NULL;

                longest_lang_range_len = 0;

                alen = 0;



                /* lang is the variant's language-tag, which is the one

                 * we are allowed to use the prefix of in HTTP/1.1