Author: stefan2
Date: Sat Feb 19 09:31:01 2011
New Revision: 1072282
URL: http://svn.apache.org/viewvc?rev=1072282&view=rev
Log:
Public definitions should be prefixed by SVN_. Thus, rename the default
compression level and introduce boundary defines.
* subversion/include/svn_delta.h
(SVN_DEFAULT_COMPRESSSION_LEVEL): rename from SVNDIFF1_COMPRESS_LEVEL
(SVN_NO_COMPRESSION_LEVEL, SVN_BEST_COMPRESSION_LEVEL):
add convenience defines for compression level boundaries
(svn_txdelta_to_svndiff2): adapt docstring
* subversion/libsvn_delta/svndiff.c,
subversion/svnserve/main.c,
subversion/svnserve/server.h: adapt
Modified:
subversion/branches/integrate-compression-level/subversion/include/svn_delta.h
subversion/branches/integrate-compression-level/subversion/libsvn_delta/svndiff.c
subversion/branches/integrate-compression-level/subversion/svnserve/main.c
subversion/branches/integrate-compression-level/subversion/svnserve/server.h
Modified:
subversion/branches/integrate-compression-level/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/branches/integrate-compression-level/subversion/include/svn_delta.h?rev=1072282&r1=1072281&r2=1072282&view=diff
==============================================================================
---
subversion/branches/integrate-compression-level/subversion/include/svn_delta.h
(original)
+++
subversion/branches/integrate-compression-level/subversion/include/svn_delta.h
Sat Feb 19 09:31:01 2011
@@ -49,11 +49,20 @@ extern "C" {
+/** This compression level effectively disables data compression.
+ * However, the data pre-processing costs may still not be zero.
+ */
+#define SVN_NO_COMPRESSION_LEVEL 0
+
+/** This is the maximum compression level we can pass to zlib.
+ */
+#define SVN_BEST_COMPRESSION_LEVEL 9
+
/** This is the default compression level we pass to zlib. It
- * should be between 0 and 9, with higher numbers being greater
- * compression.
+ * should be between 0 and 9, with higher numbers resulting in
+ * better compression rates but slower operation.
*/
-#define SVNDIFF1_COMPRESS_LEVEL 5
+#define SVN_DEFAULT_COMPRESSSION_LEVEL 5
/**
* Get libsvn_delta version information.
@@ -473,7 +482,7 @@ svn_txdelta_to_svndiff3(svn_txdelta_wind
apr_pool_t *pool);
/** Similar to svn_txdelta_to_svndiff3, but always using the SVN default
- * compression level (@ref SVNDIFF1_COMPRESS_LEVEL).
+ * compression level (@ref SVN_DEFAULT_COMPRESSSION_LEVEL).
*
* @since New in 1.4.
*/
Modified:
subversion/branches/integrate-compression-level/subversion/libsvn_delta/svndiff.c
URL:
http://svn.apache.org/viewvc/subversion/branches/integrate-compression-level/subversion/libsvn_delta/svndiff.c?rev=1072282&r1=1072281&r2=1072282&view=diff
==============================================================================
---
subversion/branches/integrate-compression-level/subversion/libsvn_delta/svndiff.c
(original)
+++
subversion/branches/integrate-compression-level/subversion/libsvn_delta/svndiff.c
Sat Feb 19 09:31:01 2011
@@ -309,7 +309,7 @@ svn_txdelta_to_svndiff2(svn_txdelta_wind
apr_pool_t *pool)
{
svn_txdelta_to_svndiff3(handler, handler_baton, output,
- svndiff_version, SVNDIFF1_COMPRESS_LEVEL, pool);
+ svndiff_version, SVN_DEFAULT_COMPRESSSION_LEVEL,
pool);
}
void
@@ -319,7 +319,7 @@ svn_txdelta_to_svndiff(svn_stream_t *out
void **handler_baton)
{
svn_txdelta_to_svndiff3(handler, handler_baton, output,
- 0, SVNDIFF1_COMPRESS_LEVEL, pool);
+ 0, SVN_DEFAULT_COMPRESSSION_LEVEL, pool);
}
Modified:
subversion/branches/integrate-compression-level/subversion/svnserve/main.c
URL:
http://svn.apache.org/viewvc/subversion/branches/integrate-compression-level/subversion/svnserve/main.c?rev=1072282&r1=1072281&r2=1072282&view=diff
==============================================================================
--- subversion/branches/integrate-compression-level/subversion/svnserve/main.c
(original)
+++ subversion/branches/integrate-compression-level/subversion/svnserve/main.c
Sat Feb 19 09:31:01 2011
@@ -451,7 +451,7 @@ int main(int argc, const char *argv[])
params.cfg = NULL;
params.pwdb = NULL;
params.authzdb = NULL;
- params.compression_level = SVNDIFF1_COMPRESS_LEVEL;
+ params.compression_level = SVN_DEFAULT_COMPRESSSION_LEVEL;
params.log_file = NULL;
params.username_case = CASE_ASIS;
params.memory_cache_size = (apr_uint64_t)-1;
Modified:
subversion/branches/integrate-compression-level/subversion/svnserve/server.h
URL:
http://svn.apache.org/viewvc/subversion/branches/integrate-compression-level/subversion/svnserve/server.h?rev=1072282&r1=1072281&r2=1072282&view=diff
==============================================================================
---
subversion/branches/integrate-compression-level/subversion/svnserve/server.h
(original)
+++
subversion/branches/integrate-compression-level/subversion/svnserve/server.h
Sat Feb 19 09:31:01 2011
@@ -115,7 +115,7 @@ typedef struct serve_params_t {
/* Data compression level to reduce for network traffic. If this
is 0, no compression should be applied and the protocol may
fall back to txdelta "version 0" bypassing zlib entirely.
- Defaults to SVNDIFF1_COMPRESS_LEVEL. */
+ Defaults to SVN_DEFAULT_COMPRESSSION_LEVEL. */
int compression_level;
} serve_params_t;
