You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/05/11 16:20:17 UTC
svn commit: r1593795 - in /subversion/trunk/subversion: libsvn_fs_fs/id.c
libsvn_fs_fs/transaction.c libsvn_fs_x/transaction.c
Author: stefan2
Date: Sun May 11 14:20:17 2014
New Revision: 1593795
URL: http://svn.apache.org/r1593795
Log:
Fix warnings for potentially undefined operation.
Some code uses increment operators on variables referenced in the same
operation. See fsfs-improvements branch (r1517479,1506545) and
fsfs-format-7 (r1453765)
* subversion/libsvn_fs_fs/id.c
(txn_id_parse): Increment data pointer in a separate statement.
* subversion/libsvn_fs_fs/transaction.c
(read_next_ids): Increment str pointer in a separate statement.
* subversion/libsvn_fs_x/transaction.c
(read_next_ids): Same.
Patch by: Andreas Stieger <andreas.stieger{_AT_}gmx.de>
Modified:
subversion/trunk/subversion/libsvn_fs_fs/id.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/id.c?rev=1593795&r1=1593794&r2=1593795&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/id.c Sun May 11 14:20:17 2014
@@ -94,8 +94,9 @@ txn_id_parse(svn_fs_fs__id_part_t *txn_i
data = strchr(data, '-');
if (data == NULL)
return FALSE;
-
- txn_id->number = svn__base36toui64(&data, ++data);
+
+ ++data;
+ txn_id->number = svn__base36toui64(&data, data);
return *data == '\0';
}
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1593795&r1=1593794&r2=1593795&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Sun May 11 14:20:17 2014
@@ -1348,7 +1348,8 @@ read_next_ids(apr_uint64_t *node_id,
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("next-id file corrupt"));
- *copy_id = svn__base36toui64(&str, ++str);
+ ++str;
+ *copy_id = svn__base36toui64(&str, str);
if (*str != '\n')
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("next-id file corrupt"));
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1593795&r1=1593794&r2=1593795&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Sun May 11 14:20:17 2014
@@ -1352,7 +1352,8 @@ read_next_ids(apr_uint64_t *node_id,
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("next-id file corrupt"));
- *copy_id = svn__base36toui64(&str, ++str);
+ ++str;
+ *copy_id = svn__base36toui64(&str, str);
if (*str != '\n')
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("next-id file corrupt"));