[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  7d63f8b2 Add missing "M" in SIZE suffixes; mention bytes are the default.
       via  bb1365dd Fix see_token zstd case.
      from  bcc273d4 Clean more built .h files.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7d63f8b249863fed83f82d97324d67ed5b141889
Author: Wayne Davison <wayne at opencoder.net>
Date:   Fri Jul 10 09:58:48 2020 -0700

    Add missing "M" in SIZE suffixes; mention bytes are the default.

commit bb1365dd7736b264738f50b683a0f81a2ed11aba
Author: Wayne Davison <wayne at opencoder.net>
Date:   Fri Jul 10 09:47:16 2020 -0700

    Fix see_token zstd case.

-----------------------------------------------------------------------

Summary of changes:
 rsync.1.md | 9 +++++----
 token.c    | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/rsync.1.md b/rsync.1.md
index 3c856742..229eb905 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -1725,15 +1725,16 @@ your home directory (remove the '=' for that).
 0.  `--max-size=SIZE`
 
     This tells rsync to avoid transferring any file that is larger than the
-    specified SIZE.  The SIZE value can be suffixed with a string to indicate a
-    size multiplier, and may be a fractional value (e.g. `--max-size=1.5m`).
+    specified SIZE.  A numeric value can be suffixed with a string to indicate
+    a size multiplier or left unqualified to specify bytes.  Feel free to use a
+    fractional value along with a suffix, such as `--max-size=1.5m`.
 
     This option is a transfer rule, not an exclude, so it doesn't affect the
     data that goes into the file-lists, and thus it doesn't affect deletions.
     It just limits the files that the receiver requests to be transferred.
 
-    The accepted suffix letters are: `B`, `K`, `G`, `T`, and `P` for bytes,
-    kilobytes/kibibytes, megabytes/mebibytes, gigabytes/gibibytes,
+    The accepted suffix letters are: `B`, `K`, `M`, `G`, `T`, and `P` for
+    bytes, kilobytes/kibibytes, megabytes/mebibytes, gigabytes/gibibytes,
     terabytes/tebibytes, and petabytes/pebibytes.  If you use a single-char
     suffix or add-on "ib" to it (e.g. "G" or "GiB") then you get units that are
     multiples of 1024.  If you use a two-letter suffix that ends with a "B"
diff --git a/token.c b/token.c
index cad6b641..61be8dd9 100644
--- a/token.c
+++ b/token.c
@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen)
 		break;
 	case CPRES_ZLIBX:
 		break;
-#ifdef SUPPORT_LZ4
-	case CPRES_LZ4:
-		/*see_uncompressed_token(data, toklen);*/
+#ifdef SUPPORT_ZSTD
+	case CPRES_ZSTD:
 		break;
 #endif
 #ifdef SUPPORT_LZ4
-	case CPRES_ZSTD:
+	case CPRES_LZ4:
+		/*see_uncompressed_token(data, toklen);*/
 		break;
 #endif
 	default:


-- 
The rsync repository.