svn commit: r1595092 - in /subversion/trunk/subversion/libsvn_fs_x: ./ fs.h low_level.c

[st...@apache.org]

Author: stefan2
Date: Fri May 16 02:57:52 2014
New Revision: 1595092

URL: http://svn.apache.org/r1595092
Log:
Sync'ing FSX with FSFS:
Merge r1510901,-96 from /branches/fsfs-improvements/subversion/libsvn_fs_fs
into /trunk/subversion/libsvn_fs_x.  No conflicts. Docstring fixes only.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/   (props changed)
    subversion/trunk/subversion/libsvn_fs_x/fs.h
    subversion/trunk/subversion/libsvn_fs_x/low_level.c

Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs:r1510901,1510996

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1595092&r1=1595091&r2=1595092&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri May 16 02:57:52 2014
@@ -195,7 +195,7 @@ typedef struct fs_x_dag_cache_t fs_x_dag
 /* Key type for all caches that use revision + offset / counter as key.
 
    NOTE: always initialize this using calloc() or '= {0};'!  This is used
-   as a cahe key and the padding bytes on 32 bit archs should be zero for
+   as a cache key and the padding bytes on 32 bit archs should be zero for
    cache effectiveness. */
 typedef struct pair_cache_key_t
 {

Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1595092&r1=1595091&r2=1595092&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Fri May 16 02:57:52 2014
@@ -579,9 +579,6 @@ svn_fs_x__unparse_representation(represe
            format_digest(rep->md5_digest, svn_checksum_md5, FALSE, pool),
            format_digest(rep->sha1_digest, svn_checksum_sha1,
                          !rep->has_sha1, pool));
-
-#undef DISPLAY_MAYBE_NULL_CHECKSUM
-
 }