You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/02/21 17:08:16 UTC

svn commit: r1073043 - in /subversion/trunk/subversion: include/svn_delta.h mod_dav_svn/mod_dav_svn.c svnserve/main.c

Author: philip
Date: Mon Feb 21 16:08:15 2011
New Revision: 1073043

URL: http://svn.apache.org/viewvc?rev=1073043&view=rev
Log:
Avoid using "best" to refer to maximum compression.

* subversion/include/svn_delta.h
  (SVN_BEST_COMPRESSION_LEVEL): Renamed to ...
  (SVN_MAX_COMPRESSION_LEVEL): ... this.
  
* subversion/svnserve/main.c
  (main): Adjust for rename.

* subversion/mod_dav_svn/mod_dav_svn.c
  (SVNCompressionLevel_cmd): Adjust for rename.
  (cmds): Use "maximum" rather than "best", don't refer to "ZIP". 

Modified:
    subversion/trunk/subversion/include/svn_delta.h
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/trunk/subversion/svnserve/main.c

Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1073043&r1=1073042&r2=1073043&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Mon Feb 21 16:08:15 2011
@@ -56,7 +56,7 @@ extern "C" {
 
 /** This is the maximum compression level we can pass to zlib.
  */
-#define SVN_BEST_COMPRESSION_LEVEL 9
+#define SVN_MAX_COMPRESSION_LEVEL 9
 
 /** This is the default compression level we pass to zlib.  It
  * should be between 0 and 9, with higher numbers resulting in

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1073043&r1=1073042&r2=1073043&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Mon Feb 21 16:08:15 2011
@@ -455,13 +455,13 @@ SVNCompressionLevel_cmd(cmd_parms *cmd, 
       return "Invalid decimal number for the SVN compression level.";
     }
 
-  if ((value < SVN_NO_COMPRESSION_LEVEL) || (value > SVN_BEST_COMPRESSION_LEVEL))
+  if ((value < SVN_NO_COMPRESSION_LEVEL) || (value > SVN_MAX_COMPRESSION_LEVEL))
     return apr_psprintf(cmd->pool,
                         "%d is not a valid compression level. "
                         "The valid range is %d .. %d.",
                         value,
                         (int)SVN_NO_COMPRESSION_LEVEL,
-                        (int)SVN_BEST_COMPRESSION_LEVEL);
+                        (int)SVN_MAX_COMPRESSION_LEVEL);
 
   svn__compression_level = value;
 
@@ -921,9 +921,9 @@ static const command_rec cmds[] =
   /* per server */
   AP_INIT_TAKE1("SVNCompressionLevel", SVNCompressionLevel_cmd, NULL,
                 RSRC_CONF,
-                "specifies the ZIP compression level used before sending file "
-                "content over the network (0 for no compression, 9 for best, "
-                "5 is default)."),
+                "specifies the compression level used before sending file "
+                "content over the network (0 for no compression, 9 for "
+                "maximum, 5 is default)."),
 
   { NULL }
 };

Modified: subversion/trunk/subversion/svnserve/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/main.c?rev=1073043&r1=1073042&r2=1073043&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/main.c (original)
+++ subversion/trunk/subversion/svnserve/main.c Mon Feb 21 16:08:15 2011
@@ -571,8 +571,8 @@ int main(int argc, const char *argv[])
           params.compression_level = atoi(arg);
           if (params.compression_level < SVN_NO_COMPRESSION_LEVEL)
             params.compression_level = SVN_NO_COMPRESSION_LEVEL;
-          if (params.compression_level > SVN_BEST_COMPRESSION_LEVEL)
-            params.compression_level = SVN_BEST_COMPRESSION_LEVEL;
+          if (params.compression_level > SVN_MAX_COMPRESSION_LEVEL)
+            params.compression_level = SVN_MAX_COMPRESSION_LEVEL;
           break;
 
         case 'M':



Re: svn commit: r1073043 - in /subversion/trunk/subversion: include/svn_delta.h mod_dav_svn/mod_dav_svn.c svnserve/main.c

Posted by Stefan Fuhrmann <eq...@web.de>.
On 21.02.2011 22:17, Bert Huijben wrote:
>> --- subversion/trunk/subversion/include/svn_delta.h (original)
>> +++ subversion/trunk/subversion/include/svn_delta.h Mon Feb 21 16:08:15
>> 2011
>> @@ -56,7 +56,7 @@ extern "C" {
>>
>>   /** This is the maximum compression level we can pass to zlib.
>>    */
>> -#define SVN_BEST_COMPRESSION_LEVEL 9
>> +#define SVN_MAX_COMPRESSION_LEVEL 9
> Is this macro new in 1.7?
>
> If it is we should document it as new and if not the old name should be properly deprecated.
Oops. Fixed in r1073242.

-- Stefan^2.

RE: svn commit: r1073043 - in /subversion/trunk/subversion: include/svn_delta.h mod_dav_svn/mod_dav_svn.c svnserve/main.c

Posted by Bert Huijben <be...@qqmail.nl>.

> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: maandag 21 februari 2011 17:08
> To: commits@subversion.apache.org
> Subject: svn commit: r1073043 - in /subversion/trunk/subversion:
> include/svn_delta.h mod_dav_svn/mod_dav_svn.c svnserve/main.c
> 
> Author: philip
> Date: Mon Feb 21 16:08:15 2011
> New Revision: 1073043
> 
> URL: http://svn.apache.org/viewvc?rev=1073043&view=rev
> Log:
> Avoid using "best" to refer to maximum compression.
> 
> * subversion/include/svn_delta.h
>   (SVN_BEST_COMPRESSION_LEVEL): Renamed to ...
>   (SVN_MAX_COMPRESSION_LEVEL): ... this.
> 
> * subversion/svnserve/main.c
>   (main): Adjust for rename.
> 
> * subversion/mod_dav_svn/mod_dav_svn.c
>   (SVNCompressionLevel_cmd): Adjust for rename.
>   (cmds): Use "maximum" rather than "best", don't refer to "ZIP".
> 
> Modified:
>     subversion/trunk/subversion/include/svn_delta.h
>     subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
>     subversion/trunk/subversion/svnserve/main.c
> 
> Modified: subversion/trunk/subversion/include/svn_delta.h
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_de
> lta.h?rev=1073043&r1=1073042&r2=1073043&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/include/svn_delta.h (original)
> +++ subversion/trunk/subversion/include/svn_delta.h Mon Feb 21 16:08:15
> 2011
> @@ -56,7 +56,7 @@ extern "C" {
> 
>  /** This is the maximum compression level we can pass to zlib.
>   */
> -#define SVN_BEST_COMPRESSION_LEVEL 9
> +#define SVN_MAX_COMPRESSION_LEVEL 9

Is this macro new in 1.7?

If it is we should document it as new and if not the old name should be properly deprecated.


	Bert