12 files changed, 45 insertions, 27 deletions

diff --git a/ACE/contrib/minizip/crypt.h b/ACE/contrib/minizip/crypt.h
index 1d6da3d57ad..94d682073a4 100644
--- a/ACE/contrib/minizip/crypt.h
+++ b/ACE/contrib/minizip/crypt.h
@@ -1,5 +1,6 @@
 /* crypt.h -- base code for crypt/uncrypt ZIPfile
 
+$Id$
 
 Version 1.01e, February 12th, 2005
 
@@ -38,9 +39,9 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
   unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
 		   * unpredictable manner on 16-bit systems; not a problem
 		   * with any known compiler so far, though */
-  
+
   MINIZIP_UNUSED_ARG(pcrc_32_tab);
-  
+
   temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
   return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
 }
diff --git a/ACE/contrib/minizip/ioapi.c b/ACE/contrib/minizip/ioapi.c
index 34775a0a99b..2c1867b7670 100644
--- a/ACE/contrib/minizip/ioapi.c
+++ b/ACE/contrib/minizip/ioapi.c
@@ -4,6 +4,8 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+
+   $Id$
 */
 
 #include <stdio.h>
@@ -86,18 +88,18 @@ voidpf ZCALLBACK fopen_file_func ( voidpf opaque,const char* filename,int mode)
 
 
 uLong ZCALLBACK fread_file_func (voidpf opaque,voidpf stream,void* buf,uLong size)
-{   
+{
     uLong ret;
-    
+
     MINIZIP_UNUSED_ARG (opaque);
-    
+
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
 
 uLong ZCALLBACK fwrite_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
-   
+
 {
     uLong ret;
     MINIZIP_UNUSED_ARG (opaque);
@@ -139,7 +141,7 @@ long ZCALLBACK fseek_file_func (voidpf opaque,voidpf stream,uLong offset,int ori
 }
 
 int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream)
-{ 
+{
     int ret;
     MINIZIP_UNUSED_ARG (opaque);
     ret = fclose((FILE *)stream);
@@ -147,7 +149,7 @@ int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream)
 }
 
 int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream)
-{ 
+{
     int ret;
     MINIZIP_UNUSED_ARG (opaque);
     ret = ferror((FILE *)stream);
@@ -155,7 +157,7 @@ int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream)
 }
 
 void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
- { 
+ {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
     pzlib_filefunc_def->zwrite_file = fwrite_file_func;
diff --git a/ACE/contrib/minizip/ioapi.h b/ACE/contrib/minizip/ioapi.h
index d0b61d4949f..9b695ffaa37 100644
--- a/ACE/contrib/minizip/ioapi.h
+++ b/ACE/contrib/minizip/ioapi.h
@@ -4,6 +4,8 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+
+   $Id$
 */
 
 #ifndef _ZLIBIOAPI_H
diff --git a/ACE/contrib/minizip/miniunz.c b/ACE/contrib/minizip/miniunz.c
index f599938884e..3a1d67d2495 100644
--- a/ACE/contrib/minizip/miniunz.c
+++ b/ACE/contrib/minizip/miniunz.c
@@ -3,6 +3,8 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+
+   $Id$
 */
 
 
diff --git a/ACE/contrib/minizip/minizip.c b/ACE/contrib/minizip/minizip.c
index f2dfecd8b12..1b13ce369c9 100644
--- a/ACE/contrib/minizip/minizip.c
+++ b/ACE/contrib/minizip/minizip.c
@@ -3,6 +3,8 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+
+   $Id$
 */
 
 #include <stdio.h>
diff --git a/ACE/contrib/minizip/minizip.mpc b/ACE/contrib/minizip/minizip.mpc
index 10442db1ff4..99be0e5b02a 100644
--- a/ACE/contrib/minizip/minizip.mpc
+++ b/ACE/contrib/minizip/minizip.mpc
@@ -1,3 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
 project (minizip) : zlib{
 
 sharedname = minizip
diff --git a/ACE/contrib/minizip/mztools.c b/ACE/contrib/minizip/mztools.c
index 8a50ee43925..e722a424900 100644
--- a/ACE/contrib/minizip/mztools.c
+++ b/ACE/contrib/minizip/mztools.c
@@ -2,6 +2,7 @@
   Additional tools for Minizip
   Code: Xavier Roche '2004
   License: Same as ZLIB (www.gzip.org)
+  $Id$
 */
 
 /* Code */
@@ -62,7 +63,7 @@ uLong* bytesRecovered;
         unsigned int fnsize = READ_16(header + 26); /* file name length */
         unsigned int extsize = READ_16(header + 28); /* extra field length */
         filename[0] = extra[0] = '\0';
-        
+
         /* Header */
         if (fwrite(header, 1, 30, fpOut) == 30) {
           offset += 30;
@@ -70,7 +71,7 @@ uLong* bytesRecovered;
           err = Z_ERRNO;
           break;
         }
-        
+
         /* Filename */
         if (fnsize > 0) {
           if (fread(filename, 1, fnsize, fpZip) == fnsize) {
@@ -103,7 +104,7 @@ uLong* bytesRecovered;
             break;
           }
         }
-        
+
         /* Data */
         {
           int dataSize = cpsize;
@@ -133,7 +134,7 @@ uLong* bytesRecovered;
             }
           }
         }
-        
+
         /* Central directory entry */
         {
           char header[46];
@@ -159,7 +160,7 @@ uLong* bytesRecovered;
           /* Header */
           if (fwrite(header, 1, 46, fpOutCD) == 46) {
             offsetCD += 46;
-            
+
             /* Filename */
             if (fnsize > 0) {
               if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
@@ -172,7 +173,7 @@ uLong* bytesRecovered;
               err = Z_STREAM_ERROR;
               break;
             }
-            
+
             /* Extra field */
             if (extsize > 0) {
               if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
@@ -182,7 +183,7 @@ uLong* bytesRecovered;
                 break;
               }
             }
-            
+
             /* Comment field */
             if (comsize > 0) {
               if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
@@ -192,8 +193,8 @@ uLong* bytesRecovered;
                 break;
               }
             }
-            
-            
+
+
           } else {
             err = Z_ERRNO;
             break;
diff --git a/ACE/contrib/minizip/mztools.h b/ACE/contrib/minizip/mztools.h
index eee78dc56b5..6e0ddaaf796 100644
--- a/ACE/contrib/minizip/mztools.h
+++ b/ACE/contrib/minizip/mztools.h
@@ -2,6 +2,7 @@
   Additional tools for Minizip
   Code: Xavier Roche '2004
   License: Same as ZLIB (www.gzip.org)
+  $Id$
 */
 
 #ifndef _zip_tools_H
@@ -17,14 +18,14 @@ extern "C" {
 
 #include "unzip.h"
 
-/* Repair a ZIP file (missing central directory) 
+/* Repair a ZIP file (missing central directory)
    file: file to recover
    fileOut: output file after recovery
    fileOutTmp: temporary file name used for recovery
 */
-extern int ZEXPORT unzRepair(const char* file, 
-                             const char* fileOut, 
-                             const char* fileOutTmp, 
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
                              uLong* nRecovered,
                              uLong* bytesRecovered);
 
diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c
index 260c225f477..ce64c887119 100644
--- a/ACE/contrib/minizip/unzip.c
+++ b/ACE/contrib/minizip/unzip.c
@@ -4,6 +4,7 @@
    Copyright (C) 1998-2005 Gilles Vollant
 
    Read unzip.h for more info
+   $Id$
 */
 
 /* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
@@ -169,7 +170,7 @@ local int unzlocal_getByte OF((
     int *pi));
 
 local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi)
-    
+
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -197,7 +198,7 @@ local int unzlocal_getShort OF((
     uLong *pX));
 
 local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-    
+
 {
     uLong x ;
     int i;
diff --git a/ACE/contrib/minizip/unzip.h b/ACE/contrib/minizip/unzip.h
index ce87ac196f4..fc219be38dd 100644
--- a/ACE/contrib/minizip/unzip.h
+++ b/ACE/contrib/minizip/unzip.h
@@ -32,6 +32,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
+   $Id$
 
 */
 
diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c
index 05d90481f53..68bd9d9ddd0 100644
--- a/ACE/contrib/minizip/zip.c
+++ b/ACE/contrib/minizip/zip.c
@@ -7,6 +7,7 @@
    Copyright (C) 1998-2005 Gilles Vollant
 
    Read zip.h for more info
+   $Id$
 */
 
 
@@ -172,7 +173,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
   return ldi;
 }
 
-local void free_datablock( linkedlist_datablock_internal* ldi)   
+local void free_datablock( linkedlist_datablock_internal* ldi)
 {
   while (ldi!=NULL)
     {
@@ -182,7 +183,7 @@ local void free_datablock( linkedlist_datablock_internal* ldi)
     }
 }
 
-local void init_linkedlist(linkedlist_data* ll)   
+local void init_linkedlist(linkedlist_data* ll)
 {
   ll->first_block = ll->last_block = NULL;
 }
@@ -195,7 +196,7 @@ local void init_linkedlist(linkedlist_data* ll)
 
 
 local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len)
-    
+
 {
   linkedlist_datablock_internal* ldi;
   const unsigned char* from_copy;
diff --git a/ACE/contrib/minizip/zip.h b/ACE/contrib/minizip/zip.h
index 1de5d815d6d..85cda0ebd7b 100644
--- a/ACE/contrib/minizip/zip.h
+++ b/ACE/contrib/minizip/zip.h
@@ -33,6 +33,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
+   $Id$
 
 */