Merge r239422 and r239423 from trunk; these are (long) casts to fix 64-bit

build warnings by asteinmetz. Tested on IA64, x64 and x86.

Originally by: asteinmetz
Reviewed by: colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293305 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
index c5493fcf1c0a993acb2ab795732027a44be0ab12..f2d0511e75c5dd9a1d80f1a66f133458f6783111 100644 (file)
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -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;
 

diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index 9c3e974e1e875f1f34446e1df7d2ac6e4a68090b..039b7a6241b37f2668a6fe28519d4a4e6134b98c 100644 (file)
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -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. */
 

diff --git a/modules/dav/main/liveprop.c b/modules/dav/main/liveprop.c
index ed7e30ce7537f155576c1d2c52b050d14b0b549c..95c22c1cadddef7e73a16343b8bdd2ae9bf084d1 100644 (file)
--- a/modules/dav/main/liveprop.c
+++ b/modules/dav/main/liveprop.c
@@ -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)
 {

diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 0d28598b6bab8706e8f81c3f90b1e53c01d6a6e4..68531d8561400c23522dc95dcbf10683c4ac73ad 100644 (file)
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -881,19 +881,19 @@ 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,
-                                       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,

diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c
index 480135de67edb4e268e893dd777c2ec539d5df84..5bf922d2e21ff06e5fd4f573a63ebff91a07c533 100644 (file)
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -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])

diff --git a/modules/dav/main/std_liveprop.c b/modules/dav/main/std_liveprop.c
index 416472ddc23ea253c4250161c67ec3725a711478..caac4a0984101db72bfaadb171764908afa44caa 100644 (file)
--- a/modules/dav/main/std_liveprop.c
+++ b/modules/dav/main/std_liveprop.c
@@ -63,7 +63,7 @@ static dav_prop_insert dav_core_insert_prop(const dav_resource *resource,
     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 @@ static dav_prop_insert dav_core_insert_prop(const dav_resource *resource,
                          info->name, dav_core_namespace_uris[info->ns]);
     }
     else if (what == DAV_PROP_INSERT_VALUE && *value != '\0') {
-        s = apr_psprintf(p, "<lp%d:%s>%s</lp%d:%s>" DEBUG_CR,
+        s = apr_psprintf(p, "<lp%ld:%s>%s</lp%ld:%s>" DEBUG_CR,
                          global_ns, info->name, value, global_ns, info->name);
     }
     else {
-        s = apr_psprintf(p, "<lp%d:%s/>" DEBUG_CR, global_ns, info->name);
+        s = apr_psprintf(p, "<lp%ld:%s/>" DEBUG_CR, global_ns, info->name);
     }
     apr_text_append(p, phdr, s);
 

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 110e4a49d91b961e81586e3bdb8c81d09904aded..2384759f34f929ab05abeca237a72c996b79f210 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -669,7 +669,7 @@ static int cgid_server(void *data)
         if (cgid_req.req_type == GETPID_REQ) {
             pid_t pid;
 
-            pid = (pid_t)apr_hash_get(script_hash, &cgid_req.conn_id, sizeof(cgid_req.conn_id));
+            pid = (pid_t)((long)apr_hash_get(script_hash, &cgid_req.conn_id, sizeof(cgid_req.conn_id)));
             if (write(sd2, &pid, sizeof(pid)) != sizeof(pid)) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0,
                              main_server,
@@ -776,7 +776,7 @@ static int cgid_server(void *data)
                     memcpy(key, &cgid_req.conn_id, sizeof(cgid_req.conn_id));
                 }
                 apr_hash_set(script_hash, key, sizeof(cgid_req.conn_id),
-                             (void *)procnew->pid);
+                             (void *)((long)procnew->pid));
             }
         }
     } 
@@ -1092,7 +1092,7 @@ static int log_script(request_rec *r, cgid_server_conf * conf, int ret,
 
 static apr_status_t close_unix_socket(void *thefd)
 {
-    int fd = (int)thefd;
+    int fd = (int)((long)thefd);
     
     return close(fd);
 }
@@ -1135,8 +1135,8 @@ static int connect_to_daemon(int *sdptr, request_rec *r,
             }
         }
         else {
-            apr_pool_cleanup_register(r->pool, (void *)sd, close_unix_socket,
-                                      apr_pool_cleanup_null);
+            apr_pool_cleanup_register(r->pool, (void *)((long)sd),
+                                      close_unix_socket, apr_pool_cleanup_null);
             break; /* we got connected! */
         }
         /* gotta try again, but make sure the cgid daemon is still around */
@@ -1369,7 +1369,7 @@ static int cgid_handler(request_rec *r)
      */
     
     apr_os_pipe_put_ex(&tempsock, &sd, 1, r->pool);
-    apr_pool_cleanup_kill(r->pool, (void *)sd, close_unix_socket);
+    apr_pool_cleanup_kill(r->pool, (void *)((long)sd), close_unix_socket);
 
     if ((argv0 = strrchr(r->filename, '/')) != NULL) 
         argv0++; 
@@ -1664,7 +1664,7 @@ static int include_cmd(include_ctx_t *ctx, ap_filter_t *f,
      * get rid of the cleanup we registered when we created the socket.
      */
     apr_os_pipe_put_ex(&tempsock, &sd, 1, r->pool);
-    apr_pool_cleanup_kill(r->pool, (void *)sd, close_unix_socket);
+    apr_pool_cleanup_kill(r->pool, (void *)((long)sd), close_unix_socket);
 
     APR_BRIGADE_INSERT_TAIL(bb, apr_bucket_pipe_create(tempsock,
                             f->c->bucket_alloc));