Commit 8c152734 authored by Andreas Steinmetz's avatar Andreas Steinmetz
Browse files

fix 64bit build warnings in modules/dav 

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

modules/dav/fs/dbm.c

+5 −5
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static apr_datum_t dav_build_key(dav_db *db, const dav_prop_name *name) 
        l_ns = 0;

    }

    else {

        int ns_id = (int)apr_hash_get(db->uri_index, name->ns,

        long ns_id = (long)apr_hash_get(db->uri_index, name->ns,

                                      APR_HASH_KEY_STRING);
@@ -313,7 +313,7 @@ static apr_datum_t dav_build_key(dav_db *db, const dav_prop_name *name) 
            return key;         /* zeroed */

        }



        l_ns = sprintf(nsbuf, "%d", ns_id - 1);

        l_ns = sprintf(nsbuf, "%ld", ns_id - 1);

    }



    /* assemble: #:name */
@@ -430,7 +430,7 @@ static dav_error * dav_propdb_open(apr_pool_t *pool, 
    }

    else {

        dav_propdb_metadata m;

        int ns;

        long ns;

        const char *uri;



        dav_set_bufsize(pool, &db->ns_table, value.dsize);
@@ -568,7 +568,7 @@ static dav_error * dav_propdb_map_namespaces( 


        const char *uri = *puri;

        apr_size_t uri_len = strlen(uri);

        int ns_id = (int)apr_hash_get(db->uri_index, uri, uri_len);

        long ns_id = (long)apr_hash_get(db->uri_index, uri, uri_len);



        if (ns_id == 0) {

            dav_check_bufsize(db->pool, &db->ns_table, uri_len + 1);
@@ -578,7 +578,7 @@ static dav_error * dav_propdb_map_namespaces( 
            /* copy the uri in case the passed-in namespaces changes in

               some way. */

            apr_hash_set(db->uri_index, apr_pstrdup(db->pool, uri), uri_len,

                         (void *)(db->ns_count + 1));

                         (void *)((long)(db->ns_count + 1)));



            db->ns_table_dirty = 1;

modules/dav/fs/repos.c

+3 −3
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ static dav_error *dav_fs_patch_validate(const dav_resource *resource, 
                             "submitted is invalid.");

    }



    *context = (void *)(value == 'T');

    *context = (void *)((long)(value == 'T'));



    return NULL;
@@ -2006,9 +2006,9 @@ static dav_error *dav_fs_patch_exec(const dav_resource *resource, 
                                    void *context,

                                    dav_liveprop_rollback **rollback_ctx)

{

    int value = context != NULL;

    long value = context != NULL;

    apr_fileperms_t perms = resource->info->finfo.protection;

    int old_value = (perms & APR_UEXECUTE) != 0;

    long old_value = (perms & APR_UEXECUTE) != 0;



    /* assert: prop == executable. operation == SET. */

modules/dav/main/liveprop.c

+8 −8
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 




static apr_hash_t *dav_liveprop_uris = NULL;

static int dav_liveprop_count = 0;

static long dav_liveprop_count = 0;





static apr_status_t dav_cleanup_liveprops(void *ctx)
@@ -35,14 +35,14 @@ static apr_status_t dav_cleanup_liveprops(void *ctx) 


static void dav_register_liveprop_namespace(apr_pool_t *p, const char *uri)

{

    int value;

    long value;



    if (dav_liveprop_uris == NULL) {

        dav_liveprop_uris = apr_hash_make(p);

        apr_pool_cleanup_register(p, NULL, dav_cleanup_liveprops, apr_pool_cleanup_null);

    }



    value = (int)apr_hash_get(dav_liveprop_uris, uri, APR_HASH_KEY_STRING);

    value = (long)apr_hash_get(dav_liveprop_uris, uri, APR_HASH_KEY_STRING);

    if (value != 0) {

        /* already registered */

        return;
@@ -53,12 +53,12 @@ static void dav_register_liveprop_namespace(apr_pool_t *p, const char *uri) 
                 (void *)++dav_liveprop_count);

}



DAV_DECLARE(int) dav_get_liveprop_ns_index(const char *uri)

DAV_DECLARE(long) dav_get_liveprop_ns_index(const char *uri)

{

    return (int)apr_hash_get(dav_liveprop_uris, uri, APR_HASH_KEY_STRING);

    return (long)apr_hash_get(dav_liveprop_uris, uri, APR_HASH_KEY_STRING);

}



DAV_DECLARE(int) dav_get_liveprop_ns_count(void)

DAV_DECLARE(long) dav_get_liveprop_ns_count(void)

{

    return dav_liveprop_count;

}
@@ -75,7 +75,7 @@ DAV_DECLARE(void) dav_add_all_liveprop_xmlns(apr_pool_t *p, 


        apr_hash_this(idx, &key, NULL, &val);



        s = apr_psprintf(p, " xmlns:lp%d=\"%s\"", (int)val, (const char *)key);

        s = apr_psprintf(p, " xmlns:lp%ld=\"%s\"", (long)val, (const char *)key);

        apr_text_append(p, phdr, s);

    }

}
@@ -108,7 +108,7 @@ DAV_DECLARE(int) dav_do_find_liveprop(const char *ns_uri, const char *name, 
    return 0;

}



DAV_DECLARE(int) dav_get_liveprop_info(int propid,

DAV_DECLARE(long) dav_get_liveprop_info(int propid,

                                       const dav_liveprop_group *group,

                                       const dav_liveprop_spec **info)

{

modules/dav/main/mod_dav.h

+5 −5
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ DAV_DECLARE(int) dav_do_find_liveprop(const char *ns_uri, const char *name, 
                                      const dav_hooks_liveprop **hooks);



/* ### docco */

DAV_DECLARE(int) dav_get_liveprop_info(int propid,

DAV_DECLARE(long) dav_get_liveprop_info(int propid,

                                        const dav_liveprop_group *group,

                                        const dav_liveprop_spec **info);
@@ -885,10 +885,10 @@ DAV_DECLARE(void) dav_register_liveprop_group(apr_pool_t *pool, 
                                              const dav_liveprop_group *group);



/* ### docco */

DAV_DECLARE(int) dav_get_liveprop_ns_index(const char *uri);

DAV_DECLARE(long) dav_get_liveprop_ns_index(const char *uri);



/* ### docco */

DAV_DECLARE(int) dav_get_liveprop_ns_count(void);

DAV_DECLARE(long) dav_get_liveprop_ns_count(void);



/* ### docco */

DAV_DECLARE(void) dav_add_all_liveprop_xmlns(apr_pool_t *p,

modules/dav/main/props.c

+3 −3
Original line number Diff line number Diff line
@@ -479,12 +479,12 @@ static void dav_output_prop_name(apr_pool_t *pool, 
    apr_text_append(pool, phdr, s);

}



static void dav_insert_xmlns(apr_pool_t *p, const char *pre_prefix, int ns,

static void dav_insert_xmlns(apr_pool_t *p, const char *pre_prefix, long ns,

                             const char *ns_uri, apr_text_header *phdr)

{

    const char *s;



    s = apr_psprintf(p, " xmlns:%s%d=\"%s\"", pre_prefix, ns, ns_uri);

    s = apr_psprintf(p, " xmlns:%s%ld=\"%s\"", pre_prefix, ns, ns_uri);

    apr_text_append(p, phdr, s);

}
@@ -765,7 +765,7 @@ DAV_DECLARE(dav_get_props_result) dav_get_props(dav_propdb *propdb, 
                    for (scan_ns_uri = priv->provider->namespace_uris;

                         *scan_ns_uri != NULL;

                         ++scan_ns_uri) {

                        int ns;

                        long ns;



                        ns = dav_get_liveprop_ns_index(*scan_ns_uri);

                        if (marks_liveprop[ns])