Commit c3a4f917 authored by Brian Havard's avatar Brian Havard
Browse files

Clean up a bunch of incompatible pointer type warnings. 


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

modules/dav/fs/lock.c

+2 −2
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static dav_error * dav_fs_load_locknull_list(apr_pool_t *p, const char *dirpath, 
    apr_finfo_t finfo;

    apr_file_t *file = NULL;

    dav_error *err = NULL;

    apr_ssize_t amt;

    apr_size_t amt;



    dav_buffer_init(p, pbuf, dirpath);
@@ -873,7 +873,7 @@ static dav_error * dav_fs_save_locknull_list(apr_pool_t *p, const char *dirpath, 
    const char *pathname;

    apr_file_t *file = NULL;

    dav_error *err = NULL;

    apr_ssize_t amt;

    apr_size_t amt;



    if (pbuf->buf == NULL)

	return NULL;

modules/dav/fs/repos.c

+2 −2
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static dav_error * dav_fs_copymove_file( 
    }



    while (1) {

	apr_ssize_t len = DAV_FS_COPY_BLOCKSIZE;

	apr_size_t len = DAV_FS_COPY_BLOCKSIZE;

	apr_status_t status;



	status = apr_file_read(inf, pbuf->buf, &len);
@@ -853,7 +853,7 @@ static dav_error * dav_fs_close_stream(dav_stream *stream, int commit) 
static dav_error * dav_fs_read_stream(dav_stream *stream,

				      void *buf, apr_size_t *bufsize)

{

    if (apr_file_read(stream->f, buf, (apr_ssize_t *)bufsize) != APR_SUCCESS) {

    if (apr_file_read(stream->f, buf, bufsize) != APR_SUCCESS) {

	/* ### use something besides 500? */

	return dav_new_error(stream->p, HTTP_INTERNAL_SERVER_ERROR, 0,

			     "An error occurred while reading from a "