Author: ivan
Date: Sun Aug 10 11:00:39 2014
New Revision: 1617088
URL: http://svn.apache.org/r1617088
Log:
On svn-auth-x509 branch: Revert r1616093 (svn_checksum_to_cstring_display2
implementation) -- it's out of the scope of svn-auth-x509 branch and I
develop local x509 implementation for formatting cert fingerprints.
Modified:
subversion/branches/svn-auth-x509/subversion/include/svn_checksum.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/err.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rep-cache.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.h
subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/md5.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/svn-auth-x509/subversion/mod_dav_svn/activity.c
subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c
subversion/branches/svn-auth-x509/subversion/svnserve/serve.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/x509-test.c
subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/dump-index-cmd.c
Modified: subversion/branches/svn-auth-x509/subversion/include/svn_checksum.h
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/svn_checksum.h?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/svn_checksum.h (original)
+++ subversion/branches/svn-auth-x509/subversion/include/svn_checksum.h Sun Aug 10 11:00:39
2014
@@ -119,59 +119,12 @@ svn_checksum_t *
svn_checksum_dup(const svn_checksum_t *checksum,
apr_pool_t *pool);
-/** Flags for use with svn_checksum_to_cstring_display2().
- *
- * @defgroup checksum_display_flags Checksum Display flags
- * @{
- */
-
- /** Display hex characters as lower case letters.
- *
- * Either this flag or #SVN_CHECKSUM_CSTRING_UPPER should be specified,
- * but not both.
- */
-#define SVN_CHECKSUM_CSTRING_LOWER 0
-
- /** Display hex characters as upper case letters.
- *
- * Either this flag or #SVN_CHECKSUM_CSTRING_LOWER should be specified,
- * but not both.
- */
-#define SVN_CHECKSUM_CSTRING_UPPER 1
-
- /** Include colons between every 2 characters of output (one byte of
- * checksum). */
-#define SVN_CHECKSUM_CSTRING_COLONS 2
-
-/** @} */
/** Return the hex representation of @a checksum, allocating the string
* in @a pool.
*
- * The output can be modified by setting the @a flags.
- *
- * The caller can choose upper or lower case characters for the hex digits
- * by specifying #SVN_CHECKSUM_CSTRING_LOWER or #SVN_CHECKSUM_CSTRING_UPPER
- * in @a flags.
- *
- * The caller can request colons for every 2 characters of output by
- * specifying #SVN_CHECKSUM_CSTRING_COLONS.
- *
- * @since New in 1.9.
- */
-const char *
-svn_checksum_to_cstring_display2(const svn_checksum_t *checksum,
- int format_flags,
- apr_pool_t *pool);
-
-/** Similar to svn_checksum_to_cstring_display2() but with @a flags
- * set to #SVN_CHECKSUM_CSTRING_LOWER.
- *
- * @deprecated Provided for backwards compatibility with the 1.8 API
- *
* @since New in 1.6.
*/
-SVN_DEPRECATED
const char *
svn_checksum_to_cstring_display(const svn_checksum_t *checksum,
apr_pool_t *pool);
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/checksum-reps-table.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
(original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
Sun Aug 10 11:00:39 2014
@@ -129,9 +129,7 @@ svn_error_t *svn_fs_bdb__set_checksum_re
svn_fs_base__track_dbt(&value, pool);
if (db_err != DB_NOTFOUND)
{
- const char *sum_str = svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ const char *sum_str = svn_checksum_to_cstring_display(checksum, pool);
return svn_error_createf
(SVN_ERR_FS_ALREADY_EXISTS, NULL,
_("Representation key for checksum '%s' exists in filesystem '%s'."),
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/err.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/err.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/err.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/err.c Sun Aug 10 11:00:39
2014
@@ -171,8 +171,7 @@ svn_fs_base__err_no_such_checksum_rep(sv
svn_error_createf
(SVN_ERR_FS_NO_SUCH_CHECKSUM_REP, 0,
_("No record in 'checksum-reps' table for checksum '%s' in "
- "filesystem '%s'"), svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- fs->pool),
+ "filesystem '%s'"), svn_checksum_to_cstring_display(checksum,
+ fs->pool),
fs->path);
}
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c Sun Aug 10 11:00:39 2014
@@ -72,9 +72,7 @@ make_digest(const char **digest,
SVN_ERR(svn_checksum(&checksum, svn_checksum_md5, str, strlen(str), pool));
- *digest = svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ *digest = svn_checksum_to_cstring_display(checksum, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c Sun Aug 10 11:00:39
2014
@@ -943,9 +943,7 @@ format_digest(const unsigned char *diges
if (is_null)
return "(null)";
- return svn_checksum_to_cstring_display2(&checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- result_pool);
+ return svn_checksum_to_cstring_display(&checksum, result_pool);
}
svn_stringbuf_t *
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rep-cache.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rep-cache.c Sun Aug 10 11:00:39
2014
@@ -287,9 +287,8 @@ svn_fs_fs__get_rep_reference(representat
if (err)
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
"Checksum '%s' in rep-cache is beyond HEAD",
- svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool));
+ svn_checksum_to_cstring_display(checksum,
+ pool));
}
return SVN_NO_ERROR;
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c Sun Aug 10 11:00:39 2014
@@ -72,9 +72,7 @@ make_digest(const char **digest,
SVN_ERR(svn_checksum(&checksum, svn_checksum_md5, str, strlen(str), pool));
- *digest = svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ *digest = svn_checksum_to_cstring_display(checksum, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c Sun Aug 10 11:00:39
2014
@@ -553,9 +553,7 @@ format_digest(const unsigned char *diges
if (is_null)
return "(null)";
- return svn_checksum_to_cstring_display2(&checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ return svn_checksum_to_cstring_display(&checksum, pool);
}
svn_stringbuf_t *
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rep-cache.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rep-cache.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rep-cache.c Sun Aug 10 11:00:39
2014
@@ -282,9 +282,8 @@ svn_fs_x__get_rep_reference(representati
if (err)
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
"Checksum '%s' in rep-cache is beyond HEAD",
- svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool));
+ svn_checksum_to_cstring_display(checksum,
+ pool));
}
return SVN_NO_ERROR;
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c Sun Aug 10 11:00:39
2014
@@ -119,9 +119,7 @@ build_key(const char **mc_key,
long_key = apr_pstrcat(pool,
apr_pstrmemdup(pool, long_key,
MEMCACHED_KEY_UNHASHED_LEN),
- svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool),
+ svn_checksum_to_cstring_display(checksum, pool),
SVN_VA_NULL);
}
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.c Sun Aug 10 11:00:39
2014
@@ -96,29 +96,18 @@ svn__empty_string_digest(svn_checksum_ki
const char *
svn__digest_to_cstring_display(const unsigned char digest[],
apr_size_t digest_size,
- int format_flags,
apr_pool_t *pool)
{
- const char *hex;
- svn_boolean_t colons = format_flags & SVN_CHECKSUM_CSTRING_COLONS;
- int chars_per_byte = 2 + (colons ? 1 : 0);
- char *str = apr_palloc(pool,
- (digest_size * chars_per_byte) + (colons ? 0 : 1));
+ static const char *hex = "0123456789abcdef";
+ char *str = apr_palloc(pool, (digest_size * 2) + 1);
apr_size_t i;
- if (format_flags & SVN_CHECKSUM_CSTRING_UPPER)
- hex = "0123456789ABCDEF";
- else
- hex = "0123456789abcdef";
-
for (i = 0; i < digest_size; i++)
{
- str[i*chars_per_byte] = hex[digest[i] >> 4];
- str[i*chars_per_byte+1] = hex[digest[i] & 0x0f];
- if (colons)
- str[i*chars_per_byte+2] = ':';
+ str[i*2] = hex[digest[i] >> 4];
+ str[i*2+1] = hex[digest[i] & 0x0f];
}
- str[i*chars_per_byte-(colons ? 1 : 0)] = '\0';
+ str[i*2] = '\0';
return str;
}
@@ -132,9 +121,7 @@ svn__digest_to_cstring(const unsigned ch
static const unsigned char zeros_digest[MAX_DIGESTSIZE] = { 0 };
if (memcmp(digest, zeros_digest, digest_size) != 0)
- return svn__digest_to_cstring_display(digest, digest_size,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ return svn__digest_to_cstring_display(digest, digest_size, pool);
else
return NULL;
}
@@ -283,9 +270,8 @@ svn_checksum_match(const svn_checksum_t
}
const char *
-svn_checksum_to_cstring_display2(const svn_checksum_t *checksum,
- int format_flags,
- apr_pool_t *pool)
+svn_checksum_to_cstring_display(const svn_checksum_t *checksum,
+ apr_pool_t *pool)
{
switch (checksum->kind)
{
@@ -295,7 +281,6 @@ svn_checksum_to_cstring_display2(const s
case svn_checksum_fnv1a_32x4:
return svn__digest_to_cstring_display(checksum->digest,
digest_sizes[checksum->kind],
- format_flags,
pool);
default:
@@ -649,12 +634,8 @@ svn_checksum_mismatch_err(const svn_chec
" expected: %s\n"
" actual: %s\n"),
desc,
- svn_checksum_to_cstring_display2(expected,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool),
- svn_checksum_to_cstring_display2(actual,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(expected, scratch_pool),
+ svn_checksum_to_cstring_display(actual, scratch_pool));
}
svn_boolean_t
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.h
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.h?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.h (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/checksum.h Sun Aug 10 11:00:39
2014
@@ -45,7 +45,6 @@ svn__empty_string_digest(svn_checksum_ki
const char *
svn__digest_to_cstring_display(const unsigned char digest[],
apr_size_t digest_size,
- int format_flags,
apr_pool_t *pool);
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c Sun Aug 10 11:00:39
2014
@@ -1491,16 +1491,3 @@ svn_auth_get_gpg_agent_simple_provider(s
svn_auth__get_gpg_agent_simple_provider(provider, pool);
}
#endif /* !WIN32 */
-
-/*** From checksum.c ***/
-const char *
-svn_checksum_to_cstring_display(const svn_checksum_t *checksum,
- apr_pool_t
- *pool)
-{
- return svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
-}
-
-
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/md5.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/md5.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/md5.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/md5.c Sun Aug 10 11:00:39 2014
@@ -42,8 +42,7 @@ const char *
svn_md5_digest_to_cstring_display(const unsigned char digest[],
apr_pool_t *pool)
{
- return svn__digest_to_cstring_display(digest, APR_MD5_DIGESTSIZE,
- SVN_CHECKSUM_CSTRING_LOWER, pool);
+ return svn__digest_to_cstring_display(digest, APR_MD5_DIGESTSIZE, pool);
}
const char *
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c Sun Aug 10 11:00:39
2014
@@ -1083,10 +1083,8 @@ svn_wc__internal_transmit_text_deltas(co
/* ### Why '..._display()'? expected_md5_checksum should never be all-
* zero, but if it is, we would want to pass NULL not an all-zero
* digest to apply_textdelta(), wouldn't we? */
- base_digest_hex =
- svn_checksum_to_cstring_display2(expected_md5_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool);
+ base_digest_hex = svn_checksum_to_cstring_display(expected_md5_checksum,
+ scratch_pool);
SVN_ERR(editor->apply_textdelta(file_baton, base_digest_hex, scratch_pool,
&handler, &wh_baton));
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c Sun Aug 10 11:00:39 2014
@@ -2055,14 +2055,10 @@ write_entry(struct write_baton **entry_n
local_relpath,
scratch_pool),
scratch_pool),
- svn_checksum_to_cstring_display2(
- entry_md5_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool),
- svn_checksum_to_cstring_display2(
- found_md5_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(
+ entry_md5_checksum, scratch_pool),
+ svn_checksum_to_cstring_display(
+ found_md5_checksum, scratch_pool));
else
{
/* ### Not sure what conditions this should cover. */
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c Sun Aug 10 11:00:39
2014
@@ -3703,12 +3703,10 @@ apply_textdelta(void *file_baton,
" expected: %s\n"
" recorded: %s\n"),
svn_dirent_local_style(fb->local_abspath, pool),
- svn_checksum_to_cstring_display2(expected_base_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool),
- svn_checksum_to_cstring_display2(recorded_base_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool));
+ svn_checksum_to_cstring_display(expected_base_checksum,
+ pool),
+ svn_checksum_to_cstring_display(recorded_base_checksum,
+ pool));
/* Open the text base for reading, unless this is an added file. */
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db_pristine.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db_pristine.c Sun Aug 10 11:00:39
2014
@@ -127,9 +127,8 @@ svn_wc__db_pristine_get_path(const char
return svn_error_createf(SVN_ERR_WC_DB_ERROR, NULL,
_("The pristine text with checksum '%s' was "
"not found"),
- svn_checksum_to_cstring_display2(sha1_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(sha1_checksum,
+ scratch_pool));
SVN_ERR(get_pristine_fname(pristine_abspath, wcroot->abspath,
sha1_checksum,
@@ -193,9 +192,8 @@ pristine_read_txn(svn_stream_t **content
{
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("Pristine text '%s' not present"),
- svn_checksum_to_cstring_display2(
- sha1_checksum, SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(
+ sha1_checksum, scratch_pool));
}
/* Open the file as a readable stream. It will remain readable even when
@@ -320,9 +318,7 @@ pristine_install_txn(svn_sqlite__db_t *s
return svn_error_createf(
SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
_("New pristine text '%s' has different size: %ld versus %ld"),
- svn_checksum_to_cstring_display2(sha1_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool),
+ svn_checksum_to_cstring_display(sha1_checksum, scratch_pool),
(long int)finfo1.size, (long int)finfo2.size);
}
}
@@ -470,9 +466,8 @@ svn_wc__db_pristine_get_md5(const svn_ch
return svn_error_createf(SVN_ERR_WC_DB_ERROR, svn_sqlite__reset(stmt),
_("The pristine text with checksum '%s' was "
"not found"),
- svn_checksum_to_cstring_display2(sha1_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(sha1_checksum,
+ scratch_pool));
SVN_ERR(svn_sqlite__column_checksum(md5_checksum, stmt, 0, result_pool));
SVN_ERR_ASSERT((*md5_checksum)->kind == svn_checksum_md5);
@@ -510,9 +505,8 @@ svn_wc__db_pristine_get_sha1(const svn_c
return svn_error_createf(SVN_ERR_WC_DB_ERROR, svn_sqlite__reset(stmt),
_("The pristine text with MD5 checksum '%s' was "
"not found"),
- svn_checksum_to_cstring_display2(md5_checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- scratch_pool));
+ svn_checksum_to_cstring_display(md5_checksum,
+ scratch_pool));
SVN_ERR(svn_sqlite__column_checksum(sha1_checksum, stmt, 0, result_pool));
SVN_ERR_ASSERT((*sha1_checksum)->kind == svn_checksum_sha1);
Modified: subversion/branches/svn-auth-x509/subversion/mod_dav_svn/activity.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/mod_dav_svn/activity.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/mod_dav_svn/activity.c (original)
+++ subversion/branches/svn-auth-x509/subversion/mod_dav_svn/activity.c Sun Aug 10 11:00:39
2014
@@ -53,9 +53,7 @@ escape_activity(const char *activity_id,
svn_checksum_t *checksum;
svn_error_clear(svn_checksum(&checksum, svn_checksum_md5, activity_id,
strlen(activity_id), pool));
- return svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ return svn_checksum_to_cstring_display(checksum, pool);
}
/* Return filename for ACTIVITY_ID under the repository in REPOS. */
Modified: subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c (original)
+++ subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c Sun Aug 10 11:00:39 2014
@@ -193,10 +193,8 @@ show_cert(const svn_string_t *pem_cert,
SVN_ERR(svn_cmdline_printf(scratch_pool, _("Issuer: %s\n"),
svn_x509_certinfo_get_issuer(certinfo)));
SVN_ERR(svn_cmdline_printf(scratch_pool, _("Fingerprint: %s\n"),
- svn_checksum_to_cstring_display2(
+ svn_checksum_to_cstring_display(
svn_x509_certinfo_get_digest(certinfo),
- SVN_CHECKSUM_CSTRING_UPPER |
- SVN_CHECKSUM_CSTRING_COLONS,
scratch_pool)));
hostnames = svn_x509_certinfo_get_hostnames(certinfo);
Modified: subversion/branches/svn-auth-x509/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/svnserve/serve.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/svnserve/serve.c (original)
+++ subversion/branches/svn-auth-x509/subversion/svnserve/serve.c Sun Aug 10 11:00:39 2014
@@ -1562,9 +1562,7 @@ static svn_error_t *get_file(svn_ra_svn_
SVN_CMD_ERR(svn_fs_revision_root(&root, b->repository->fs, rev, pool));
SVN_CMD_ERR(svn_fs_file_checksum(&checksum, svn_checksum_md5, root,
full_path, TRUE, pool));
- hex_digest = svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ hex_digest = svn_checksum_to_cstring_display(checksum, pool);
/* Fetch the file's explicit and/or inherited properties if
requested. Although the wants-iprops boolean was added to the
Modified: subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/checksum-test.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/checksum-test.c Sun Aug
10 11:00:39 2014
@@ -45,9 +45,7 @@ checksum_parse_kind(const char *digest,
svn_checksum_t *checksum;
SVN_ERR(svn_checksum_parse_hex(&checksum, kind, digest, pool));
- checksum_display = svn_checksum_to_cstring_display2(checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ checksum_display = svn_checksum_to_cstring_display(checksum, pool);
if (strcmp(checksum_display, digest) != 0)
return svn_error_createf
Modified: subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/x509-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/x509-test.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/x509-test.c (original)
+++ subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/x509-test.c Sun Aug 10
11:00:39 2014
@@ -474,10 +474,8 @@ compare_results(struct x509_test *xt,
xt->subject,
pool));
- v = svn_checksum_to_cstring_display2(
- svn_x509_certinfo_get_digest(certinfo),
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ v = svn_checksum_to_cstring_display(
+ svn_x509_certinfo_get_digest(certinfo), pool);
if (!v)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"No SHA1 digest for cert '%s'", xt->subject);
Modified: subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c Sun Aug 10
11:00:39 2014
@@ -344,9 +344,8 @@ pretty_print(const char *name,
value = apr_hash_this_val(hi);
SVN_ERR(svn_cmdline_printf(scratch_pool, "%s %" APR_UINT64_T_FMT " %s\n",
name, value->refcount,
- svn_checksum_to_cstring_display2(
+ svn_checksum_to_cstring_display(
&value->checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
scratch_pool)));
}
Modified: subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/dump-index-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/dump-index-cmd.c?rev=1617088&r1=1617087&r2=1617088&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/dump-index-cmd.c (original)
+++ subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/dump-index-cmd.c Sun Aug 10
11:00:39 2014
@@ -43,9 +43,7 @@ fnv1_to_string(apr_uint32_t fnv1,
checksum.digest = (const unsigned char *)&digest;
/* Convert the digest to hex. */
- return svn_checksum_to_cstring_display2(&checksum,
- SVN_CHECKSUM_CSTRING_LOWER,
- pool);
+ return svn_checksum_to_cstring_display(&checksum, pool);
}
/* Map svn_fs_fs__p2l_entry_t.type to C string. */
|