subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1228602 - in /subversion/trunk/subversion/libsvn_ra_serf: serf.c util.c
Date Sat, 07 Jan 2012 12:24:42 GMT
Author: stefan2
Date: Sat Jan  7 12:24:42 2012
New Revision: 1228602

URL: http://svn.apache.org/viewvc?rev=1228602&view=rev
Log:
Follow-up to r1224647: when being used in certain loops, apr_strtok made
it necessary to NULL the input string in loops. When switching to  
svn_cstring_tokenize, we must remove that idiosyncrasy from the caller.

* subversion/libsvn_ra_serf/serf.c
  (load_http_auth_types): don't NULL the string buffer that we are
   operating on
* subversion/libsvn_ra_serf/util.c
  (load_authorities): same here

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/serf.c
    subversion/trunk/subversion/libsvn_ra_serf/util.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1228602&r1=1228601&r2=1228602&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Sat Jan  7 12:24:42 2012
@@ -108,7 +108,6 @@ load_http_auth_types(apr_pool_t *pool, s
       apr_collapse_spaces(auth_types_list, http_auth_types);
       while ((token = svn_cstring_tokenize(";", &auth_types_list)) != NULL)
         {
-          auth_types_list = NULL;
           if (svn_cstring_casecmp("basic", token) == 0)
             *authn_types |= SERF_AUTHN_BASIC;
           else if (svn_cstring_casecmp("digest", token) == 0)

Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1228602&r1=1228601&r2=1228602&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Sat Jan  7 12:24:42 2012
@@ -400,7 +400,6 @@ load_authorities(svn_ra_serf__connection
              _("Invalid config: unable to load certificate file '%s'"),
              svn_dirent_local_style(file, pool));
         }
-      files = NULL;
     }
 
   return SVN_NO_ERROR;



Mime
View raw message