[PATCH 2/3] Fix spelling in comments in Ada source files (zlib)

[PATCH 2/3] Fix spelling in comments in Ada source files (zlib)

[Ambrogino Modigliani]

zlib/ChangeLog:

	* contrib/ada/zlib-streams.ads: Fix spelling in comments.
	* contrib/ada/zlib-thin.ads: Fix spelling in comments.
	* contrib/ada/zlib.ads: Fix spelling in comments.
---
 zlib/contrib/ada/zlib-streams.ads | 6 +++---
 zlib/contrib/ada/zlib-thin.ads    | 2 +-
 zlib/contrib/ada/zlib.ads         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zlib/contrib/ada/zlib-streams.ads b/zlib/contrib/ada/zlib-streams.ads
index f0193c6..8e26cd4 100644
--- a/zlib/contrib/ada/zlib-streams.ads
+++ b/zlib/contrib/ada/zlib-streams.ads
@@ -31,7 +31,7 @@ package ZLib.Streams is
       Mode   : in     Flush_Mode := Sync_Flush);
    --  Flush the written data to the back stream,
    --  all data placed to the compressor is flushing to the Back stream.
-   --  Should not be used untill necessary, becouse it is decreasing
+   --  Should not be used until necessary, because it is decreasing
    --  compression.
 
    function Read_Total_In (Stream : in Stream_Type) return Count;
@@ -97,13 +97,13 @@ private
       Rest_Last  : Stream_Element_Offset;
       --  Buffer for Read operation.
       --  We need to have this buffer in the record
-      --  becouse not all read data from back stream
+      --  because not all read data from back stream
       --  could be processed during the read operation.
 
       Buffer_Size : Stream_Element_Offset;
       --  Buffer size for write operation.
       --  We do not need to have this buffer
-      --  in the record becouse all data could be
+      --  in the record because all data could be
       --  processed in the write operation.
 
       Back       : Stream_Access;
diff --git a/zlib/contrib/ada/zlib-thin.ads b/zlib/contrib/ada/zlib-thin.ads
index d4407eb..810173c 100644
--- a/zlib/contrib/ada/zlib-thin.ads
+++ b/zlib/contrib/ada/zlib-thin.ads
@@ -436,7 +436,7 @@ private
 
    pragma Import (C, inflateBackInit, "inflateBackInit_");
 
-   --  I stopped binding the inflateBack routines, becouse realize that
+   --  I stopped binding the inflateBack routines, because realize that
    --  it does not support zlib and gzip headers for now, and have no
    --  symmetric deflateBack routines.
    --  ZLib-Ada is symmetric regarding deflate/inflate data transformation
diff --git a/zlib/contrib/ada/zlib.ads b/zlib/contrib/ada/zlib.ads
index 79ffc40..29af826 100644
--- a/zlib/contrib/ada/zlib.ads
+++ b/zlib/contrib/ada/zlib.ads
@@ -260,7 +260,7 @@ package ZLib is
         (Item : out Ada.Streams.Stream_Element_Array;
          Last : out Ada.Streams.Stream_Element_Offset);
       --  User should provide data for compression/decompression
-      --  thru this routine.
+      --  through this routine.
 
       Buffer : in out Ada.Streams.Stream_Element_Array;
       --  Buffer for keep remaining data from the previous
-- 
2.7.4

[PATCH 1/3] Fix spelling in comments in C source files (zlib)

[Ambrogino Modigliani]

zlib/ChangeLog:

	* contrib/minizip/ioapi.h: Fix spelling in comments.
	* contrib/minizip/miniunz.c: Fix spelling in comments.
	* contrib/minizip/minizip.c: Fix spelling in comments.
	* contrib/minizip/unzip.c: Fix spelling in comments.
	* contrib/minizip/unzip.h: Fix spelling in comments.
	* contrib/minizip/zip.c: Fix spelling in comments.
	* examples/enough.c: Fix spelling in comments.
	* examples/zran.c: Fix spelling in comments.
---
 zlib/contrib/minizip/ioapi.h   | 2 +-
 zlib/contrib/minizip/miniunz.c | 2 +-
 zlib/contrib/minizip/minizip.c | 4 ++--
 zlib/contrib/minizip/unzip.c   | 8 ++++----
 zlib/contrib/minizip/unzip.h   | 4 ++--
 zlib/contrib/minizip/zip.c     | 2 +-
 zlib/examples/enough.c         | 2 +-
 zlib/examples/zran.c           | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/zlib/contrib/minizip/ioapi.h b/zlib/contrib/minizip/ioapi.h
index 8dcbdb0..e19f5c2 100644
--- a/zlib/contrib/minizip/ioapi.h
+++ b/zlib/contrib/minizip/ioapi.h
@@ -82,7 +82,7 @@
 #include "mz64conf.h"
 #endif
 
-/* a type choosen by DEFINE */
+/* a type chosen by DEFINE */
 #ifdef HAVE_64BIT_INT_CUSTOM
 typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
 #else
diff --git a/zlib/contrib/minizip/miniunz.c b/zlib/contrib/minizip/miniunz.c
index 3d65401b..6ca6858 100644
--- a/zlib/contrib/minizip/miniunz.c
+++ b/zlib/contrib/minizip/miniunz.c
@@ -607,7 +607,7 @@ int main(argc,argv)
 #        endif
 
         strncpy(filename_try, zipfilename,MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        /* strncpy doesn't append the trailing NULL, of the string is too long. */
         filename_try[ MAXFILENAME ] = '\0';
 
 #        ifdef USEWIN32IOAPI
diff --git a/zlib/contrib/minizip/minizip.c b/zlib/contrib/minizip/minizip.c
index 4288962..b13ca60 100644
--- a/zlib/contrib/minizip/minizip.c
+++ b/zlib/contrib/minizip/minizip.c
@@ -113,7 +113,7 @@ uLong filetime(f, tmzip, dt)
       len = MAXFILENAME;
 
     strncpy(name, f,MAXFILENAME-1);
-    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    /* strncpy doesn't append the trailing NULL, of the string is too long. */
     name[ MAXFILENAME ] = '\0';
 
     if (name[len - 1] == '/')
@@ -322,7 +322,7 @@ int main(argc,argv)
 
         zipok = 1 ;
         strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        /* strncpy doesn't append the trailing NULL, of the string is too long. */
         filename_try[ MAXFILENAME ] = '\0';
 
         len=(int)strlen(filename_try);
diff --git a/zlib/contrib/minizip/unzip.c b/zlib/contrib/minizip/unzip.c
index 9093504..cbc482c 100644
--- a/zlib/contrib/minizip/unzip.c
+++ b/zlib/contrib/minizip/unzip.c
@@ -53,7 +53,7 @@
   Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
                                 should only read the compressed/uncompressed size from the Zip64 format if
                                 the size from normal header was 0xFFFFFFFF
-  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches received from Gilles Vollant
         Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
                                 Patch created by Daniel Borca
 
@@ -200,7 +200,7 @@ typedef struct
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF
    for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
+   IN assertion: the stream s has been successfully opened for reading.
 */
 
 
@@ -380,8 +380,8 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil
 
 /*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
                                                                 or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
         (like 1 on Unix, 2 on Windows)
diff --git a/zlib/contrib/minizip/unzip.h b/zlib/contrib/minizip/unzip.h
index 2104e39..9e7378d 100644
--- a/zlib/contrib/minizip/unzip.h
+++ b/zlib/contrib/minizip/unzip.h
@@ -155,8 +155,8 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
                                                  int iCaseSensitivity));
 /*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
                                 or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
     (like 1 on Unix, 2 on Windows)
diff --git a/zlib/contrib/minizip/zip.c b/zlib/contrib/minizip/zip.c
index ea54853..976aad0 100644
--- a/zlib/contrib/minizip/zip.c
+++ b/zlib/contrib/minizip/zip.c
@@ -15,7 +15,7 @@
    Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
    Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
                                  It is used when recreting zip archive with RAW when deleting items from a zip.
-                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
    Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
    Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
 
diff --git a/zlib/examples/enough.c b/zlib/examples/enough.c
index b991144..b81f502 100644
--- a/zlib/examples/enough.c
+++ b/zlib/examples/enough.c
@@ -402,7 +402,7 @@ local void examine(int syms, int len, int left, int mem, int rem)
    requires that maximum.  Uses the globals max, root, and num. */
 local void enough(int syms)
 {
-    int n;              /* number of remaing symbols for this node */
+    int n;              /* number of remaining symbols for this node */
     int left;           /* number of unused bit patterns at this length */
     size_t index;       /* index of this case in *num */
 
diff --git a/zlib/examples/zran.c b/zlib/examples/zran.c
index 278f9ad..b8c87e4 100644
--- a/zlib/examples/zran.c
+++ b/zlib/examples/zran.c
@@ -19,7 +19,7 @@
    An access point can be created at the start of any deflate block, by saving
    the starting file offset and bit of that block, and the 32K bytes of
    uncompressed data that precede that block.  Also the uncompressed offset of
-   that block is saved to provide a referece for locating a desired starting
+   that block is saved to provide a reference for locating a desired starting
    point in the uncompressed stream.  build_index() works by decompressing the
    input zlib or gzip stream a block at a time, and at the end of each block
    deciding if enough uncompressed data has gone by to justify the creation of
-- 
2.7.4

[PATCH 3/3] Fix spelling in comments in Assembler files (zlib)

[Ambrogino Modigliani]

zlib/ChangeLog:

	* contrib/inflate86/inffast.S: Fix spelling in comments.
---
 zlib/contrib/inflate86/inffast.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zlib/contrib/inflate86/inffast.S b/zlib/contrib/inflate86/inffast.S
index 2245a29..8619833 100644
--- a/zlib/contrib/inflate86/inffast.S
+++ b/zlib/contrib/inflate86/inffast.S
@@ -26,7 +26,7 @@
  * Jan-26-2003 -- Added runtime check for MMX support with cpuid instruction.
  * With -DUSE_MMX, only MMX code is compiled.  With -DNO_MMX, only non-MMX code
  * is compiled.  Without either option, runtime detection is enabled.  Runtime
- * detection should work on all modern cpus and the recomended algorithm (flip
+ * detection should work on all modern cpus and the recommended algorithm (flip
  * ID bit on eflags and then use the cpuid instruction) is used in many
  * multimedia applications.  Tested under win2k with gcc-2.95 and gas-2.12
  * distributed with cygwin3.  Compiling with gcc-2.95 -c inffast.S -o
-- 
2.7.4

[PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Ambrogino Modigliani]

This series fixes number of spelling mistakes in comments in source code
files in various languages.

Vast majority of mistakes were discovered by a tool, however each mistake
is manually checked.

Ambrogino Modigliani (3):
  Fix spelling in comments in C source files (zlib)
  Fix spelling in comments in Ada source files (zlib)
  Fix spelling in comments in Assembler files (zlib)

 zlib/contrib/ada/zlib-streams.ads | 6 +++---
 zlib/contrib/ada/zlib-thin.ads    | 2 +-
 zlib/contrib/ada/zlib.ads         | 2 +-
 zlib/contrib/inflate86/inffast.S  | 2 +-
 zlib/contrib/minizip/ioapi.h      | 2 +-
 zlib/contrib/minizip/miniunz.c    | 2 +-
 zlib/contrib/minizip/minizip.c    | 4 ++--
 zlib/contrib/minizip/unzip.c      | 8 ++++----
 zlib/contrib/minizip/unzip.h      | 4 ++--
 zlib/contrib/minizip/zip.c        | 2 +-
 zlib/examples/enough.c            | 2 +-
 zlib/examples/zran.c              | 2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

-- 
2.7.4

Re: [PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Pedro Alves]

Did you intend to send this to the zlib list instead, as per:

 https://sourceware.org/ml/gdb-patches/2016-11/msg00633.html

?

I don't think we should put this in our local copy.  It'll only make
merging zlib from upstream harder, for no real gain, IMO.

Thanks,
Pedro Alves

Re: [PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Ambrogino Modigliani]

Hi, I don't know how to submit patches to zlib repository. It looks to
me that zlib development stopped some time ago, and that it is not
likely that they will ever accept patches like these. You can ignore
this series if you don't want these patches. If you tell me how to
submitt the to zlib, I will do it. Thanks.

On Fri, Nov 25, 2016 at 9:01 PM, Pedro Alves <palves@redhat.com> wrote:
> Did you intend to send this to the zlib list instead, as per:
>
>  https://sourceware.org/ml/gdb-patches/2016-11/msg00633.html
>
> ?
>
> I don't think we should put this in our local copy.  It'll only make
> merging zlib from upstream harder, for no real gain, IMO.
>
> Thanks,
> Pedro Alves
>

Re: [PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 66 bytes --]

zlib changes should go to the upstream zlib project instead
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/3] Fix spelling in comments in C source files (zlib)

[Luis Machado]

On 11/25/2016 01:45 PM, Ambrogino Modigliani wrote:
> zlib/ChangeLog:
>
> 	* contrib/minizip/ioapi.h: Fix spelling in comments.
> 	* contrib/minizip/miniunz.c: Fix spelling in comments.
> 	* contrib/minizip/minizip.c: Fix spelling in comments.
> 	* contrib/minizip/unzip.c: Fix spelling in comments.
> 	* contrib/minizip/unzip.h: Fix spelling in comments.
> 	* contrib/minizip/zip.c: Fix spelling in comments.
> 	* examples/enough.c: Fix spelling in comments.
> 	* examples/zran.c: Fix spelling in comments.
> ---
>  zlib/contrib/minizip/ioapi.h   | 2 +-
>  zlib/contrib/minizip/miniunz.c | 2 +-
>  zlib/contrib/minizip/minizip.c | 4 ++--
>  zlib/contrib/minizip/unzip.c   | 8 ++++----
>  zlib/contrib/minizip/unzip.h   | 4 ++--
>  zlib/contrib/minizip/zip.c     | 2 +-
>  zlib/examples/enough.c         | 2 +-
>  zlib/examples/zran.c           | 2 +-
>  8 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/zlib/contrib/minizip/ioapi.h b/zlib/contrib/minizip/ioapi.h
> index 8dcbdb0..e19f5c2 100644
> --- a/zlib/contrib/minizip/ioapi.h
> +++ b/zlib/contrib/minizip/ioapi.h
> @@ -82,7 +82,7 @@
>  #include "mz64conf.h"
>  #endif
>
> -/* a type choosen by DEFINE */
> +/* a type chosen by DEFINE */
>  #ifdef HAVE_64BIT_INT_CUSTOM
>  typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
>  #else
> diff --git a/zlib/contrib/minizip/miniunz.c b/zlib/contrib/minizip/miniunz.c
> index 3d65401b..6ca6858 100644
> --- a/zlib/contrib/minizip/miniunz.c
> +++ b/zlib/contrib/minizip/miniunz.c
> @@ -607,7 +607,7 @@ int main(argc,argv)
>  #        endif
>
>          strncpy(filename_try, zipfilename,MAXFILENAME-1);
> -        /* strncpy doesnt append the trailing NULL, of the string is too long. */
> +        /* strncpy doesn't append the trailing NULL, of the string is too long. */

"... or the string..."

Multiple occurrences of the same typo...

>          filename_try[ MAXFILENAME ] = '\0';
>
>  #        ifdef USEWIN32IOAPI
> diff --git a/zlib/contrib/minizip/minizip.c b/zlib/contrib/minizip/minizip.c
> index 4288962..b13ca60 100644
> --- a/zlib/contrib/minizip/minizip.c
> +++ b/zlib/contrib/minizip/minizip.c
> @@ -113,7 +113,7 @@ uLong filetime(f, tmzip, dt)
>        len = MAXFILENAME;
>
>      strncpy(name, f,MAXFILENAME-1);
> -    /* strncpy doesnt append the trailing NULL, of the string is too long. */
> +    /* strncpy doesn't append the trailing NULL, of the string is too long. */
>      name[ MAXFILENAME ] = '\0';
>

...here...

>      if (name[len - 1] == '/')
> @@ -322,7 +322,7 @@ int main(argc,argv)
>
>          zipok = 1 ;
>          strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
> -        /* strncpy doesnt append the trailing NULL, of the string is too long. */
> +        /* strncpy doesn't append the trailing NULL, of the string is too long. */
>          filename_try[ MAXFILENAME ] = '\0';

... and here.

>
>          len=(int)strlen(filename_try);
> diff --git a/zlib/contrib/minizip/unzip.c b/zlib/contrib/minizip/unzip.c
> index 9093504..cbc482c 100644
> --- a/zlib/contrib/minizip/unzip.c
> +++ b/zlib/contrib/minizip/unzip.c
> @@ -53,7 +53,7 @@
>    Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
>                                  should only read the compressed/uncompressed size from the Zip64 format if
>                                  the size from normal header was 0xFFFFFFFF
> -  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
> +  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches received from Gilles Vollant

"...from patches..."

>          Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)

"... with compression method..."

> @@ -380,8 +380,8 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil
>
>  /*
>     Compare two filename (fileName1,fileName2).
> -   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
> -   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
> +   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
> +   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi

"...case sensitive..."?

>                                                                  or strcasecmp)
>     If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
>          (like 1 on Unix, 2 on Windows)
> diff --git a/zlib/contrib/minizip/unzip.h b/zlib/contrib/minizip/unzip.h
> index 2104e39..9e7378d 100644
> --- a/zlib/contrib/minizip/unzip.h
> +++ b/zlib/contrib/minizip/unzip.h
> @@ -155,8 +155,8 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
>                                                   int iCaseSensitivity));
>  /*
>     Compare two filename (fileName1,fileName2).
> -   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
> -   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
> +   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
> +   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi

Same here.

>                                  or strcasecmp)
>     If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
>      (like 1 on Unix, 2 on Windows)
> diff --git a/zlib/contrib/minizip/zip.c b/zlib/contrib/minizip/zip.c
> index ea54853..976aad0 100644
> --- a/zlib/contrib/minizip/zip.c
> +++ b/zlib/contrib/minizip/zip.c
> @@ -15,7 +15,7 @@
>     Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
>     Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
>                                   It is used when recreting zip archive with RAW when deleting items from a zip.

"... when recreating..."

> -                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
> +                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
>     Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)

"... to items that need it..."

"... and existing ZIP64 data needs to..."

Otherwise looks good. Quite a few typos, thanks!

Re: [PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Joseph Myers]

On Fri, 25 Nov 2016, Ambrogino Modigliani wrote:

> Hi, I don't know how to submit patches to zlib repository. It looks to

The zlib website says zlib@gzip.org - have you tried mailing that address?

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 0/3] Fix spelling mistakes in comments - ZLIB

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

On 25 Nov 2016 21:39, Ambrogino Modigliani wrote:
> Hi, I don't know how to submit patches to zlib repository. It looks to
> me that zlib development stopped some time ago, and that it is not
> likely that they will ever accept patches like these. You can ignore
> this series if you don't want these patches. If you tell me how to
> submitt the to zlib, I will do it. Thanks.

http://zlib.net/mailman/listinfo/zlib-devel_madler.net
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]