Committed, rev 574 -- thanks, Max!
-Karl
Max Okumoto <okumoto@ucsd.edu> writes:
> Hi, I am using sun's compiler:
>
> % cc -V
> cc: WorkShop Compilers 4.2 30 Oct 1996 C 4.2
>
> % man cc
> The cc(1) manual page describes the ANSI C compiler options
> that are SVID compliant under Solaris 2.x. cc uses getopt to
> parse command-line options. Options are treated as a single
> letter or as a single letter followed by an argument. See
> getopt(3c).
>
> Here is another patch for some of the apr_* incompatable type warnings
> generated by the compiler. They are benign, I need something to do until
> I get more familiar with the code :-)
>
> Max Okumoto
>
>
> Index: ./subversion/tests/libsvn_subr/hashdump-test.c
> ===================================================================
> --- ./subversion/tests/libsvn_subr/.svn/text-base/hashdump-test.c.svn-base Sat Nov 24 02:35:25 2001
> +++ ./subversion/tests/libsvn_subr/hashdump-test.c Wed Nov 28 05:46:12 2001
> @@ -165,7 +165,7 @@
> this = apr_hash_next (this))
> {
> const void *key;
> - size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> svn_stringbuf_t *orig_str, *new_str;
>
> Index: ./subversion/libsvn_delta/track_editor.c
> ===================================================================
> --- ./subversion/libsvn_delta/.svn/text-base/track_editor.c.svn-base Sun Nov 25 02:26:03 2001
> +++ ./subversion/libsvn_delta/track_editor.c Wed Nov 28 05:04:20 2001
> @@ -302,7 +302,7 @@
> {
> char *path;
> void *val;
> - apr_size_t ignored_len;
> + apr_ssize_t ignored_len;
> svn_stringbuf_t path_str;
> enum svn_recurse_kind r;
>
> Index: ./subversion/libsvn_ra/ra_loader.c
> ===================================================================
> --- ./subversion/libsvn_ra/.svn/text-base/ra_loader.c.svn-base Sat Nov 24 02:31:39 2001
> +++ ./subversion/libsvn_ra/ra_loader.c Wed Nov 28 05:26:48 2001
> @@ -179,7 +179,7 @@
> {
> const void *key;
> void *val;
> - size_t keylen;
> + apr_ssize_t keylen;
> const char *keystr;
>
> /* Get key and val. */
> @@ -238,7 +238,7 @@
> {
> const void *key;
> void *val;
> - size_t keylen;
> + apr_ssize_t keylen;
>
> /* Get key and val. */
> apr_hash_this (this, &key, &keylen, &val);
> Index: ./subversion/libsvn_wc/props.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/props.c.svn-base Sat Nov 24 02:44:24 2001
> +++ ./subversion/libsvn_wc/props.c Wed Nov 28 05:33:54 2001
> @@ -74,7 +74,7 @@
> for (hi = apr_hash_first (pool, baseprops); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_stringbuf_t *propval1, *propval2;
>
> @@ -110,7 +110,7 @@
> for (hi = apr_hash_first (pool, localprops); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_stringbuf_t *propval1, *propval2;
>
> Index: ./subversion/libsvn_wc/entries.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/entries.c.svn-base Sun Nov 25 02:24:38 2001
> +++ ./subversion/libsvn_wc/entries.c Wed Nov 28 05:33:17 2001
> @@ -465,7 +465,7 @@
> for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> svn_wc_entry_t *this_entry;
> svn_stringbuf_t *entryname;
> @@ -1011,7 +1011,7 @@
> for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> svn_wc_entry_t *this_entry;
>
> @@ -1125,7 +1125,7 @@
> for (hi = apr_hash_first (pool, atts); hi; hi = apr_hash_next (hi))
> {
> const void *k;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *v;
> const char *key;
> svn_stringbuf_t *val;
> @@ -1491,7 +1491,7 @@
> hi = apr_hash_next (hi))
> {
> const void *k;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *v;
>
> const char *key;
> @@ -1546,7 +1546,7 @@
> for (hi = apr_hash_first (subpool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> const char *name;
> svn_wc_entry_t *current_entry;
> Index: ./subversion/libsvn_wc/copy.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/copy.c.svn-base Wed Nov 28 04:41:29 2001
> +++ ./subversion/libsvn_wc/copy.c Wed Nov 28 05:32:08 2001
> @@ -61,7 +61,7 @@
> for (hi = apr_hash_first (subpool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> const char *name;
> svn_wc_entry_t *current_entry;
> Index: ./subversion/libsvn_wc/adm_crawler.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/adm_crawler.c.svn-base Sun Nov 25 02:24:44 2001
> +++ ./subversion/libsvn_wc/adm_crawler.c Wed Nov 28 05:37:56 2001
> @@ -203,7 +203,7 @@
> svn_error_t *err;
> const void *key;
> void *val;
> - apr_size_t klen;
> + apr_ssize_t klen;
> svn_stringbuf_t *unlock_path;
>
> apr_hash_this (hi, &key, &klen, &val);
> @@ -235,7 +235,7 @@
> {
> const void *key;
> void *val;
> - apr_size_t klen;
> + apr_ssize_t klen;
> svn_stringbuf_t *tmpfile_path;
> enum svn_node_kind kind;
>
> @@ -555,7 +555,7 @@
> struct target_baton *tb;
> const void *key;
> void *val;
> - size_t keylen;
> + apr_ssize_t keylen;
>
> for (hi = apr_hash_first (pool, affected_targets);
> hi;
> @@ -744,7 +744,7 @@
> for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_wc_entry_t *entry;
> int is_this_dir;
> @@ -1445,7 +1445,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_wc_entry_t *current_entry;
>
> @@ -1854,7 +1854,7 @@
> for (hi = apr_hash_first (subpool, dirents); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> const char *keystring;
> svn_stringbuf_t *current_entry_name;
> @@ -1914,7 +1914,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_stringbuf_t *current_entry_name;
> svn_wc_entry_t *current_entry;
> Index: ./subversion/libsvn_wc/log.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/log.c.svn-base Tue Nov 27 01:32:10 2001
> +++ ./subversion/libsvn_wc/log.c Wed Nov 28 05:36:40 2001
> @@ -800,7 +800,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> svn_stringbuf_t *current_entry_name;
> svn_wc_entry_t *current_entry;
> @@ -1232,7 +1232,7 @@
> for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> void *val;
> svn_wc_entry_t *entry;
> svn_boolean_t is_this_dir = FALSE;
> Index: ./subversion/libsvn_wc/status.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/status.c.svn-base Sat Nov 24 02:44:34 2001
> +++ ./subversion/libsvn_wc/status.c Wed Nov 28 05:35:39 2001
> @@ -313,7 +313,7 @@
> const void *key;
> void *val;
> const char *basename;
> - apr_size_t keylen;
> + apr_ssize_t keylen;
> svn_stringbuf_t *fullpath = svn_stringbuf_dup (path, pool);
>
> /* Get the next dirent */
> Index: ./subversion/libsvn_wc/status_editor.c
> ===================================================================
> --- ./subversion/libsvn_wc/.svn/text-base/status_editor.c.svn-base Sun Nov 25 02:24:53 2001
> +++ ./subversion/libsvn_wc/status_editor.c Wed Nov 28 05:34:40 2001
> @@ -650,7 +650,7 @@
> {
> const void *key;
> void *val;
> - apr_size_t klen;
> + apr_ssize_t klen;
> svn_wc_status_t *status;
>
> apr_hash_this (hi, &key, &klen, &val);
> Index: ./subversion/libsvn_subr/xml.c
> ===================================================================
> --- ./subversion/libsvn_subr/.svn/text-base/xml.c.svn-base Sat Nov 24 02:43:54 2001
> +++ ./subversion/libsvn_subr/xml.c Wed Nov 28 05:29:29 2001
> @@ -448,7 +448,7 @@
> {
> const void *key;
> void *val;
> - size_t keylen;
> + apr_ssize_t keylen;
>
> apr_hash_this (hi, &key, &keylen, &val);
> assert (val != NULL);
> Index: ./subversion/libsvn_subr/io.c
> ===================================================================
> --- ./subversion/libsvn_subr/.svn/text-base/io.c.svn-base Sat Nov 24 02:43:47 2001
> +++ ./subversion/libsvn_subr/io.c Wed Nov 28 05:28:37 2001
> @@ -414,7 +414,7 @@
> for (hi = apr_hash_first (subpool, dirents); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
> const char *entryname;
> enum svn_node_kind *entrykind;
> Index: ./subversion/libsvn_subr/hashdump.c
> ===================================================================
> --- ./subversion/libsvn_subr/.svn/text-base/hashdump.c.svn-base Sat Nov 24 02:43:44 2001
> +++ ./subversion/libsvn_subr/hashdump.c Wed Nov 28 05:28:57 2001
> @@ -113,7 +113,7 @@
> {
> const void *key;
> void *val;
> - size_t keylen;
> + apr_ssize_t keylen;
> size_t vallen;
> int bytes_used;
> char *valstring;
> Index: ./subversion/libsvn_subr/sorts.c
> ===================================================================
> --- ./subversion/libsvn_subr/.svn/text-base/sorts.c.svn-base Sat Nov 24 02:43:43 2001
> +++ ./subversion/libsvn_subr/sorts.c Wed Nov 28 05:28:10 2001
> @@ -103,7 +103,7 @@
> for (hi = apr_hash_first (pool, ht); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *value;
> svn_item_t **receiver;
> svn_item_t *item = apr_pcalloc (pool, sizeof(*item));
> Index: ./subversion/libsvn_client/prop_commands.c
> ===================================================================
> --- ./subversion/libsvn_client/.svn/text-base/prop_commands.c.svn-base Sat Nov 24 02:43:02 2001
> +++ ./subversion/libsvn_client/prop_commands.c Wed Nov 28 05:39:16 2001
> @@ -57,7 +57,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void * val;
> svn_stringbuf_t *current_entry_name;
> svn_stringbuf_t *full_entry_path = svn_stringbuf_dup (target, pool);
> @@ -117,7 +117,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void * val;
> svn_stringbuf_t *current_entry_name;
> svn_stringbuf_t *full_entry_path = svn_stringbuf_dup (target, pool);
> @@ -230,7 +230,7 @@
> {
> const void *key;
> const char *keystring;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void * val;
> svn_stringbuf_t *current_entry_name;
> svn_stringbuf_t *full_entry_path = svn_stringbuf_dup (target, pool);
>
> Index: ./subversion/clients/cmdline/props.c
> ===================================================================
> --- ./subversion/clients/cmdline/.svn/text-base/props.c.svn-base Sat Nov 24 02:39:24 2001
> +++ ./subversion/clients/cmdline/props.c Wed Nov 28 05:45:51 2001
> @@ -43,7 +43,7 @@
> for (hi = apr_hash_first (pool, prop_hash); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> - apr_size_t klen;
> + apr_ssize_t klen;
> void *val;
>
> svn_stringbuf_t *propkey, *propval;
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:50 2006