You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/01/06 05:04:09 UTC
svn commit: r1555655 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/sysinfo.c
Author: svn-role
Date: Mon Jan 6 04:04:09 2014
New Revision: 1555655
URL: http://svn.apache.org/r1555655
Log:
Merge the r1544878 group from trunk:
* r1544878, r1544895
Fix output of svn --version -v to not cut info off on linux.
Justification:
Obviously wrong.
Notes:
The relevant code is #ifdeffed out on anything but linux.
Votes:
+1: breser (without r1544895), rhuijben, danielsh, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/sysinfo.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1544878,1544895
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1555655&r1=1555654&r2=1555655&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jan 6 04:04:09 2014
@@ -277,15 +277,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1544878, r1544895
- Fix output of svn --version -v to not cut info off on linux.
- Justification:
- Obviously wrong.
- Notes:
- The relevant code is #ifdeffed out on anything but linux.
- Votes:
- +1: breser (without r1544895), rhuijben, danielsh, stefan2
-
* r1550803
Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/sysinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/sysinfo.c?rev=1555655&r1=1555654&r2=1555655&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/sysinfo.c Mon Jan 6 04:04:09 2014
@@ -290,11 +290,21 @@ stringbuf_split_key(svn_stringbuf_t *buf
return NULL;
svn_stringbuf_strip_whitespace(buffer);
+
+ /* Now we split the currently allocated buffer in two parts:
+ - a const char * HEAD
+ - the remaining stringbuf_t. */
+
+ /* Create HEAD as '\0' terminated const char * */
key = buffer->data;
end = strchr(key, delim);
*end = '\0';
- buffer->len = 1 + end - key;
+
+ /* And update the TAIL to be a smaller, but still valid stringbuf */
buffer->data = end + 1;
+ buffer->len -= 1 + end - key;
+ buffer->blocksize -= 1 + end - key;
+
svn_stringbuf_strip_whitespace(buffer);
return key;