subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1635823 - in /subversion/trunk/subversion/libsvn_fs_x: ./ id.c
Date Fri, 31 Oct 2014 17:38:24 GMT
Author: stefan2
Date: Fri Oct 31 17:38:23 2014
New Revision: 1635823

URL: http://svn.apache.org/r1635823
Log:
Sync FSX with FSFS:
Merge revisions r1619358 and r1620602 from libsvn_fs_fs and resolve
the usual text conflicts with FSX.

These changes fix portability issues the the ID struct handling.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/   (props changed)
    subversion/trunk/subversion/libsvn_fs_x/id.c

Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/libsvn_fs_fs:r1619358,1620602

Modified: subversion/trunk/subversion/libsvn_fs_x/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/id.c?rev=1635823&r1=1635822&r2=1635823&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/id.c Fri Oct 31 17:38:23 2014
@@ -246,8 +246,9 @@ svn_fs_x__id_eq(const svn_fs_id_t *a,
   if (a == b)
     return TRUE;
 
-  return memcmp(&id_a->node_id, &id_b->node_id,
-                3 * sizeof(svn_fs_x__id_part_t)) == 0;
+  return svn_fs_x__id_part_eq(&id_a->node_id, &id_b->node_id)
+      && svn_fs_x__id_part_eq(&id_a->copy_id, &id_b->copy_id)
+      && svn_fs_x__id_part_eq(&id_a->noderev_id, &id_b->noderev_id);
 }
 
 
@@ -385,7 +386,7 @@ svn_fs_id_t *
 svn_fs_x__id_copy(const svn_fs_id_t *source, apr_pool_t *pool)
 {
   const fs_x__id_t *id = (const fs_x__id_t *)source;
-  fs_x__id_t *new_id = apr_pmemdup(pool, id, sizeof(*id));
+  fs_x__id_t *new_id = apr_pmemdup(pool, id, sizeof(*new_id));
 
   new_id->generic_id.fsap_data = new_id;
   new_id->pool = pool;



Mime
View raw message