svn commit: r999829 - in /subversion/trunk/subversion: svnserve/cyrus_auth.c tests/libsvn_subr/cache-test.c tests/libsvn_subr/target-test.c

[ju...@apache.org]

Author: julianfoad
Date: Wed Sep 22 09:29:32 2010
New Revision: 999829

URL: http://svn.apache.org/viewvc?rev=999829&view=rev
Log:
Avoid some "casting away const" warnings.

* subversion/svnserve/cyrus_auth.c
  (cyrus_auth_request): Don't cast away "const".

* subversion/tests/libsvn_subr/cache-test.c
  (deserialize_revnum): Same.

* subversion/tests/libsvn_subr/target-test.c
  (condense_targets_tests_helper): Same.

Modified:
    subversion/trunk/subversion/svnserve/cyrus_auth.c
    subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
    subversion/trunk/subversion/tests/libsvn_subr/target-test.c

Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/cyrus_auth.c?rev=999829&r1=999828&r2=999829&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/trunk/subversion/svnserve/cyrus_auth.c Wed Sep 22 09:29:32 2010
@@ -361,7 +361,7 @@ svn_error_t *cyrus_auth_request(svn_ra_s
 
       if ((p = strchr(user, '@')) != NULL)
         /* Drop the realm part. */
-        b->user = apr_pstrndup(b->pool, user, p - (char *)user);
+        b->user = apr_pstrndup(b->pool, user, p - (const char *)user);
       else
         {
           svn_error_t *err;

Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=999829&r1=999828&r2=999829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Wed Sep 22 09:29:32 2010
@@ -71,11 +71,12 @@ deserialize_revnum(void **out,
                    apr_size_t data_len,
                    apr_pool_t *pool)
 {
-  svn_revnum_t *in_rev, *out_rev;
+  const svn_revnum_t *in_rev = (const svn_revnum_t *) data;
+  svn_revnum_t *out_rev;
+
   if (data_len != sizeof(*in_rev))
     return svn_error_create(SVN_ERR_REVNUM_PARSE_FAILURE, NULL,
                             _("Bad size for revision number in cache"));
-  in_rev = (svn_revnum_t *) data;
   out_rev = apr_palloc(pool, sizeof(*out_rev));
   *out_rev = *in_rev;
   *out = out_rev;

Modified: subversion/trunk/subversion/tests/libsvn_subr/target-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/target-test.c?rev=999829&r1=999828&r2=999829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/target-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/target-test.c Wed Sep 22 09:29:32 2010
@@ -64,7 +64,8 @@ condense_targets_tests_helper(const char
   apr_array_header_t *targets;
   apr_array_header_t *condensed_targets;
   const char *common_path, *common_path2, *curdir;
-  char *token, *iter, *exp_common_abs = (char*)exp_common;
+  char *token, *iter;
+  const char *exp_common_abs = exp_common;
   int i;
   char buf[8192];