Changeset 745 for trunk/server/lib/zlib

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/zlib/contrib/ada/zlib-streams.ads (modified) (3 diffs)
• lib/zlib/contrib/ada/zlib-thin.ads (modified) (1 diff)
• lib/zlib/contrib/minizip/miniunz.c (modified) (1 diff)
• lib/zlib/contrib/minizip/minizip.c (modified) (2 diffs)
• lib/zlib/contrib/minizip/unzip.c (modified) (2 diffs)
• lib/zlib/contrib/minizip/unzip.h (modified) (1 diff)
• lib/zlib/contrib/minizip/zip.c (modified) (2 diffs)
• lib/zlib/contrib/puff/puff.c (modified) (1 diff)
• lib/zlib/deflate.h (modified) (1 diff)
• lib/zlib/examples/fitblk.c (modified) (1 diff)
• lib/zlib/examples/gun.c (modified) (1 diff)
• lib/zlib/gzio.c (modified) (2 diffs)
• lib/zlib/wscript (copied) (copied from vendor/current/lib/zlib/wscript )
• lib/zlib/zlib.h (modified) (1 diff)

trunk/server/lib/zlib/contrib/ada/zlib-streams.ads

@@ -32 +32 @@
    --  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 untill necessary, because it is decreasing
    --  compression.
 
@@ -98 +98 @@
       --  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.
 
@@ -104 +104 @@
       --  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.
 

trunk/server/lib/zlib/contrib/ada/zlib-thin.ads

@@ -437 +437 @@
    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.

trunk/server/lib/zlib/contrib/minizip/miniunz.c

@@ -537 +537 @@
 
         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, if the string is too long. */
         filename_try[ MAXFILENAME ] = '\0';
 

trunk/server/lib/zlib/contrib/minizip/minizip.c

@@ -78 +78 @@
 
     strncpy(name, f,MAXFILENAME-1);
-    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    /* strncpy doesn't append the trailing NULL, if the string is too long. */
     name[ MAXFILENAME ] = '\0';
 
@@ -254 +254 @@
         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, if the string is too long. */
         filename_try[ MAXFILENAME ] = '\0';
 

trunk/server/lib/zlib/contrib/minizip/unzip.c

@@ -160 +160 @@
      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.
 */
 
@@ -296 +296 @@
 /*
    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 iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                                                 or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+   If iCaseSensitivity = 0, case sensitivity is default of your operating system
         (like 1 on Unix, 2 on Windows)
 

trunk/server/lib/zlib/contrib/minizip/unzip.h

@@ -125 +125 @@
 /*
    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 iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                 or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+   If iCaseSensitivity = 0, case sensitivity is default of your operating system
     (like 1 on Unix, 2 on Windows)
 */

trunk/server/lib/zlib/contrib/minizip/zip.c

@@ -100 +100 @@
   uLong  avail_in_this_block;
   uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignement */
+  uLong  unused; /* for future use and alignment */
   unsigned char data[SIZEDATA_INDATABLOCK];
 } linkedlist_datablock_internal;
@@ -118 +118 @@
 
     uLong pos_local_header;     /* offset of the local header of the file
-                                     currenty writing */
+                                     currently writing */
     char* central_header;       /* central header data for the current file */
     uLong size_centralheader;   /* size of the central header for cur file */
     uLong flag;                 /* flag of the file currently writing */
 
-    int  method;                /* compression method of file currenty wr.*/
+    int  method;                /* compression method of file currently wr.*/
     int  raw;                   /* 1 for directly writing raw data */
     Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/

trunk/server/lib/zlib/contrib/puff/puff.c

@@ -586 +586 @@
  *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
  *   that length, and the symbols 16, 17, and 18 are run-length instructions.
- *   Each of 16, 17, and 18 are follwed by extra bits to define the length of
+ *   Each of 16, 17, and 18 are followed by extra bits to define the length of
  *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
  *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols

trunk/server/lib/zlib/deflate.h

@@ -189 +189 @@
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */

trunk/server/lib/zlib/examples/fitblk.c

@@ -18 +18 @@
    nearly the requested output block size.  The first pass generates
    enough deflate blocks to produce output to fill the requested
-   output size plus a specfied excess amount (see the EXCESS define
+   output size plus a specified excess amount (see the EXCESS define
    below).  The last deflate block may go quite a bit past that, but
    is discarded.  The second pass decompresses and recompresses just

trunk/server/lib/zlib/examples/gun.c

@@ -43 +43 @@
    encountered in an input file, it is the last stream in that file.
 
-   Like gunzip and uncompress, the file attributes of the orignal compressed
+   Like gunzip and uncompress, the file attributes of the original compressed
    file are maintained in the final uncompressed file, to the extent that the
    user permissions allow it.

trunk/server/lib/zlib/gzio.c

@@ -255 +255 @@
      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.
 */
 local int get_byte(s)
@@ -280 +280 @@
     to Z_DATA_ERROR if the magic header is present but the rest of the header
     is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
+    IN assertion: the stream s has already been created successfully;
        s->stream.avail_in is zero for the first time, but may be non-zero
        for concatenated .gz files.

trunk/server/lib/zlib/zlib.h

@@ -886 +886 @@
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not
    be allocated, or Z_VERSION_ERROR if the version of the library does not
    match the version of the header file.