Commit 03443740 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly 

excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

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

include/http_config.h

+3 −3
Changes for include/http_config.h: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct ap_configfile_t { 
    /**< an apr_file_getc()-like function */

    apr_status_t (*getch) (char *ch, void *param);

    /**< an apr_file_gets()-like function */

    apr_status_t (*getstr) (void *buf, size_t bufsiz, void *param);

    apr_status_t (*getstr) (void *buf, apr_size_t bufsiz, void *param);

    /**< a close handler function */

    apr_status_t (*close) (void *param);

    /**< the argument passed to getch/getstr/close */
@@ -773,7 +773,7 @@ AP_DECLARE(ap_configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, 
    const char *descr,

    void *param,

    apr_status_t (*getc_func) (char *ch, void *param),

    apr_status_t (*gets_func) (void *buf, size_t bufsiz, void *param),

    apr_status_t (*gets_func) (void *buf, apr_size_t bufsiz, void *param),

    apr_status_t (*close_func) (void *param));



/**
@@ -784,7 +784,7 @@ AP_DECLARE(ap_configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, 
 * @param cfp File to read from

 * @return error status, APR_ENOSPC if bufsize is too small for the line

 */

AP_DECLARE(apr_status_t) ap_cfg_getline(char *buf, size_t bufsize, ap_configfile_t *cfp);

AP_DECLARE(apr_status_t) ap_cfg_getline(char *buf, apr_size_t bufsize, ap_configfile_t *cfp);



/**

 * Read one char from open configfile_t, increase line number upon LF

include/http_core.h

+1 −1
Changes for include/http_core.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ AP_DECLARE(apr_off_t) ap_get_limit_req_body(const request_rec *r); 
 * @param r The current request

 * @return the maximum number of bytes in XML request msg body

 */

AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r);

AP_DECLARE(apr_size_t) ap_get_limit_xml_body(const request_rec *r);



/**

 * Install a custom response handler for a given status

include/http_protocol.h

+4 −2
Changes for include/http_protocol.h: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -209,8 +209,10 @@ AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t of 
 * @param length The amount of data to send

 * @return The number of bytes sent

 */

AP_DECLARE(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,

                             size_t length);

AP_DECLARE(apr_size_t) ap_send_mmap(apr_mmap_t *mm,

                                    request_rec *r,

                                    apr_size_t offset,

                                    apr_size_t length);

#endif

include/httpd.h

+5 −3
Changes for include/httpd.h: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1803,8 +1803,9 @@ AP_DECLARE(void) ap_pregfree(apr_pool_t *p, ap_regex_t *reg); 
 * @param pmatch the pmatch array returned from ap_pregex

 * @return The substituted string, or NULL on error

 */

AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,

                              size_t nmatch, ap_regmatch_t pmatch[]);

AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input,

                              const char *source, apr_size_t nmatch,

                              ap_regmatch_t pmatch[]);



/**

 * After performing a successful regex match, you may use this function to
@@ -1822,7 +1823,8 @@ AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *sour 
 */

AP_DECLARE(apr_status_t) ap_pregsub_ex(apr_pool_t *p, char **result,

                                       const char *input, const char *source,

                                       size_t nmatch, ap_regmatch_t pmatch[],

                                       apr_size_t nmatch,

                                       ap_regmatch_t pmatch[],

                                       apr_size_t maxlen);



/**

include/util_varbuf.h

+2 −1
Changes for include/util_varbuf.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ AP_DECLARE(char *) ap_varbuf_pdup(apr_pool_t *p, struct ap_varbuf *vb, 
 */

AP_DECLARE(apr_status_t) ap_varbuf_regsub(struct ap_varbuf *vb,

                                          const char *input,

                                          const char *source, size_t nmatch,

                                          const char *source,

                                          apr_size_t nmatch,

                                          ap_regmatch_t pmatch[],

                                          apr_size_t maxlen);