Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 76213 invoked from network); 23 Aug 2005 15:45:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Aug 2005 15:45:10 -0000 Received: (qmail 77578 invoked by uid 500); 23 Aug 2005 15:45:09 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 77552 invoked by uid 500); 23 Aug 2005 15:45:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 77536 invoked by uid 99); 23 Aug 2005 15:45:09 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 23 Aug 2005 08:45:08 -0700 Received: (qmail 76184 invoked by uid 65534); 23 Aug 2005 15:45:08 -0000 Message-ID: <20050823154508.76181.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r239422 - in /httpd/httpd/trunk/modules/dav: fs/dbm.c fs/repos.c main/liveprop.c main/mod_dav.h main/props.c main/std_liveprop.c Date: Tue, 23 Aug 2005 15:45:07 -0000 To: cvs@httpd.apache.org From: asteinmetz@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: asteinmetz Date: Tue Aug 23 08:45:00 2005 New Revision: 239422 URL: http://svn.apache.org/viewcvs?rev=239422&view=rev Log: fix 64bit build warnings in modules/dav Modified: httpd/httpd/trunk/modules/dav/fs/dbm.c httpd/httpd/trunk/modules/dav/fs/repos.c httpd/httpd/trunk/modules/dav/main/liveprop.c httpd/httpd/trunk/modules/dav/main/mod_dav.h httpd/httpd/trunk/modules/dav/main/props.c httpd/httpd/trunk/modules/dav/main/std_liveprop.c Modified: httpd/httpd/trunk/modules/dav/fs/dbm.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/fs/dbm.c?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/fs/dbm.c (original) +++ httpd/httpd/trunk/modules/dav/fs/dbm.c Tue Aug 23 08:45:00 2005 @@ -304,7 +304,7 @@ 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 @@ 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 @@ } 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 @@ 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 @@ /* 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; Modified: httpd/httpd/trunk/modules/dav/fs/repos.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/fs/repos.c?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/fs/repos.c (original) +++ httpd/httpd/trunk/modules/dav/fs/repos.c Tue Aug 23 08:45:00 2005 @@ -1988,7 +1988,7 @@ "submitted is invalid."); } - *context = (void *)(value == 'T'); + *context = (void *)((long)(value == 'T')); return NULL; @@ -2006,9 +2006,9 @@ 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. */ Modified: httpd/httpd/trunk/modules/dav/main/liveprop.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/liveprop.c?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/liveprop.c (original) +++ httpd/httpd/trunk/modules/dav/main/liveprop.c Tue Aug 23 08:45:00 2005 @@ -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 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 @@ (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 @@ 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 @@ 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) { Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original) +++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Tue Aug 23 08:45:00 2005 @@ -876,19 +876,19 @@ const dav_hooks_liveprop **hooks); /* ### docco */ -DAV_DECLARE(int) dav_get_liveprop_info(int propid, - const dav_liveprop_group *group, - const dav_liveprop_spec **info); +DAV_DECLARE(long) dav_get_liveprop_info(int propid, + const dav_liveprop_group *group, + const dav_liveprop_spec **info); /* ### docco */ 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, Modified: httpd/httpd/trunk/modules/dav/main/props.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/props.c?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/props.c (original) +++ httpd/httpd/trunk/modules/dav/main/props.c Tue Aug 23 08:45:00 2005 @@ -479,12 +479,12 @@ 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 @@ 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]) Modified: httpd/httpd/trunk/modules/dav/main/std_liveprop.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/std_liveprop.c?rev=239422&r1=239421&r2=239422&view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/std_liveprop.c (original) +++ httpd/httpd/trunk/modules/dav/main/std_liveprop.c Tue Aug 23 08:45:00 2005 @@ -63,7 +63,7 @@ const char *s; apr_pool_t *p = resource->pool; const dav_liveprop_spec *info; - int global_ns; + long global_ns; switch (propid) { @@ -128,11 +128,11 @@ info->name, dav_core_namespace_uris[info->ns]); } else if (what == DAV_PROP_INSERT_VALUE && *value != '\0') { - s = apr_psprintf(p, "%s" DEBUG_CR, + s = apr_psprintf(p, "%s" DEBUG_CR, global_ns, info->name, value, global_ns, info->name); } else { - s = apr_psprintf(p, "" DEBUG_CR, global_ns, info->name); + s = apr_psprintf(p, "" DEBUG_CR, global_ns, info->name); } apr_text_append(p, phdr, s);