Commit b488d214 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Various code cleanup to avoid compiler, cppcheck, or clang warnings: 

modules/debugging/mod_firehose.c: Make some internal functions static
                                  (to do: logs_cleanup() is unused)

modules/filters/mod_charset_lite.c: Remove dead assignments

modules/filters/mod_include.c: likewise

modules/metadata/mod_usertrack.c: likewise

modules/proxy/mod_proxy_ftp.c: likewise

modules/ssl/ssl_engine_pphrase.c: likewise

modules/proxy/mod_proxy_balancer.c: likewise;
                                    Remove NULL check that can never happen

modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it
                            would, it would just mask another bug

os/unix/unixd.c: likewise

modules/http/http_filters.c: Remove sub-condition that is always true

modules/lua/mod_lua.c: Add default cases to switch statements

modules/generators/mod_autoindex.c: Unsigned value can never be < 0

server/util_expr_eval.c: Fix compiler warnings with VC and on OS2



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

modules/debugging/mod_firehose.c

+4 −4
Changes for modules/debugging/mod_firehose.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -104,21 +104,21 @@ typedef struct firehose_ctx_t 
#define BODY_LEN (PIPE_BUF - HEADER_LEN - 2)

#define HEADER_FMT "%" APR_UINT64_T_HEX_FMT " %" APR_UINT64_T_HEX_FMT " %c %s %" APR_UINT64_T_HEX_FMT CRLF



apr_status_t logs_cleanup(void *dummy)

static apr_status_t logs_cleanup(void *dummy)

{

    apr_file_t *file = (apr_file_t *) dummy;

    apr_file_close(file);

    return APR_SUCCESS;

}



apr_status_t filter_output_cleanup(void *dummy)

static apr_status_t filter_output_cleanup(void *dummy)

{

    ap_filter_t *f = (ap_filter_t *) dummy;

    ap_remove_output_filter(f);

    return APR_SUCCESS;

}



apr_status_t filter_input_cleanup(void *dummy)

static apr_status_t filter_input_cleanup(void *dummy)

{

    ap_filter_t *f = (ap_filter_t *) dummy;

    ap_remove_input_filter(f);
@@ -128,7 +128,7 @@ apr_status_t filter_input_cleanup(void *dummy) 
/**

 * Add the terminating empty fragment to indicate end-of-connection.

 */

apr_status_t pumpit_cleanup(void *dummy)

static apr_status_t pumpit_cleanup(void *dummy)

{

    firehose_ctx_t *ctx = (firehose_ctx_t *) dummy;

    apr_status_t rv;

modules/filters/mod_charset_lite.c

+0 −3
Changes for modules/filters/mod_charset_lite.c: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -864,11 +864,9 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
                consumed_bucket = NULL;

            }

            if (dptr == APR_BRIGADE_SENTINEL(bb)) {

                done = 1;

                break;

            }

            if (APR_BUCKET_IS_EOS(dptr)) {

                done = 1;

                cur_len = -1; /* XXX yuck, but that tells us to send

                                 * eos down; when we minimize our bb construction

                                 * we'll fix this crap */
@@ -894,7 +892,6 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
            }

            rv = apr_bucket_read(dptr, &cur_str, &cur_len, APR_BLOCK_READ);

            if (rv != APR_SUCCESS) {

                done = 1;

                ctx->ees = EES_BUCKET_READ;

                break;

            }

modules/filters/mod_include.c

+1 −1
Changes for modules/filters/mod_include.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3809,7 +3809,6 @@ static int includes_setup(ap_filter_t *f) 
static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b)

{

    request_rec *r = f->r;

    include_ctx_t *ctx = f->ctx;

    request_rec *parent;

    include_dir_config *conf = ap_get_module_config(r->per_dir_config,

                                                    &include_module);
@@ -3827,6 +3826,7 @@ static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b) 


    if (!f->ctx) {

        struct ssi_internal_ctx *intern;

        include_ctx_t *ctx;



        /* create context for this filter */

        f->ctx = ctx = apr_palloc(r->pool, sizeof(*ctx));

modules/generators/mod_autoindex.c

+1 −1
Changes for modules/generators/mod_autoindex.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ static char *find_title(request_rec *r) 
        }

        n = sizeof(char) * (MAX_STRING_LEN - 1);

        apr_file_read(thefile, titlebuf, &n);

        if (n <= 0) {

        if (n == 0) {

            apr_file_close(thefile);

            return NULL;

        }

modules/http/http_filters.c

+1 −1
Changes for modules/http/http_filters.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static long get_chunk_size(char *b) 
        chunkbits -= 4;

        ++b;

    }

    if (apr_isxdigit(*b) && (chunkbits <= 0)) {

    if (apr_isxdigit(*b)) {

        /* overflow */

        return -1;

    }