Author: julianfoad
Date: Fri May 8 15:52:31 2015
New Revision: 1678388
URL: http://svn.apache.org/r1678388
Log:
On the 'move-tracking-2' branch: Avoid casting away 'const'.
* subversion/libsvn_delta/branch.c
(svn_branch_state_parse): Tweak code to avoid casting away 'const'
in string operations.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1678388&r1=1678387&r2=1678388&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Fri
May 8 15:52:31 2015
@@ -968,12 +968,12 @@ svn_branch_state_parse(svn_branch_state_
/* Find the outer branch and outer EID */
if (strcmp(bid, "B0") != 0)
{
- char *outer_bid = apr_pstrdup(scratch_pool, bid);
- char *last_dot = strrchr(outer_bid, '.');
+ char *last_dot = strrchr(bid, '.');
+ const char *outer_bid;
if (last_dot) /* BID looks like "B3.11" or "B3.11.22" etc. */
{
- *last_dot = '\0';
+ outer_bid = apr_pstrndup(scratch_pool, bid, last_dot - bid);
outer_eid = atoi(last_dot + 1);
}
else /* looks like "B22" (non-zero and with no dot) */
