linux-kernel - Re: [PATCH] lib: zstd: clean up double word in comment.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <007504A7-BA2C-43EB-B61C-BFDA56E951BF@fb.com>
Date:   Mon, 31 Jan 2022 20:36:29 +0000
From:   Nick Terrell <terrelln@...com>
To:     "trix@...hat.com" <trix@...hat.com>
CC:     "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] lib: zstd: clean up double word in comment.

> On Jan 20, 2022, at 5:20 AM, trix@...hat.com wrote:
> 
> From: Tom Rix <trix@...hat.com>
> 
> Remove the second 'a' and 'into'.
> 
> Signed-off-by: Tom Rix <trix@...hat.com>
> ---
> include/linux/zstd_lib.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/zstd_lib.h b/include/linux/zstd_lib.h
> index b8c7dbf98390f..6b91758b61af9 100644
> --- a/include/linux/zstd_lib.h
> +++ b/include/linux/zstd_lib.h
> @@ -1330,7 +1330,7 @@ ZSTDLIB_API size_t ZSTD_generateSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs,
> 
> /*! ZSTD_mergeBlockDelimiters() :
>  * Given an array of ZSTD_Sequence, remove all sequences that represent block delimiters/last literals
> - * by merging them into into the literals of the next sequence.
> + * by merging them into the literals of the next sequence.
>  *
>  * As such, the final generated result has no explicit representation of block boundaries,
>  * and the final last literals segment is not represented in the sequences.
> @@ -1377,7 +1377,7 @@ ZSTDLIB_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* dst, size
> /*! ZSTD_writeSkippableFrame() :
>  * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer.
>  *
> - * Skippable frames begin with a a 4-byte magic number. There are 16 possible choices of magic number,
> + * Skippable frames begin with a 4-byte magic number. There are 16 possible choices of magic number,
>  * ranging from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15.
>  * As such, the parameter magicVariant controls the exact skippable frame magic number variant used, so
>  * the magic number used will be ZSTD_MAGIC_SKIPPABLE_START + magicVariant.
> -- 
> 2.26.3
> 

Thanks for the patch! I've merged it into my tree [0][1] and will be included in my next PR.

-Nick

[0] https://github.com/terrelln/linux/tree/zstd-linus
[1] https://github.com/terrelln/linux/commit/88a309465b3f05a100c3b81966982c0f9f5d23a6