Changeset 8362 in orxonox.OLD for trunk/src/lib/network/zip.cc

Timestamp:

Jun 14, 2006, 10:08:41 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: removed stupid included in base_object.h
this should lead to faster compile-times

File:

• trunk/src/lib/network/zip.cc (modified) (16 diffs)

trunk/src/lib/network/zip.cc

@@ -17 +17 @@
 
 #include "src/lib/util/loading/resource_manager.h"
+#include "debug.h"
 
 /**
@@ -54 +55 @@
   fileName = fileName + "/dicts/" + name;
   //PRINTF(0)("filename: %s\n", fileName.c_str());
-  
+
   FILE * f = fopen( fileName.c_str(), "r" );
-  
+
   if ( !f )
   {
@@ -62 +63 @@
     return false;
   }
-  
+
   byte buf[1024];
-  
+
   int nBytesRead = 0;
-  
+
   while ( !feof( f ) )
   {
     nBytesRead += fread( buf, 1, sizeof(buf), f );
   }
-  
+
   DictionaryEntry entry;
-  
+
   entry.dictLen = nBytesRead;
   entry.dict = new Byte[nBytesRead];
-  
+
   fseek( f, 0, SEEK_SET );
-  
+
   assert( fread( entry.dict, 1, nBytesRead, f ) == nBytesRead );
-  
+
   entry.adler = adler32( adler32( 0L, Z_NULL, 0 ), entry.dict, nBytesRead );
-  
+
   dicts.push_back( entry );
-  
+
   PRINTF(3)("Loaded dictionary '%s' with adler = %d\n", name.c_str(), entry.adler );
-  
+
   return true;
 }
@@ -106 +107 @@
     return -1;
   }
-  
+
   int res;
 
@@ -124 +125 @@
 
   res = deflateSetDictionary( &strm, (Bytef*)(dicts[dict].dict), dicts[dict].dictLen );
-        
+
   if ( res != Z_OK )
   {
@@ -139 +140 @@
 
   res = deflate( &strm, Z_FINISH );
-        
+
   if ( res != Z_STREAM_END )
   {
@@ -152 +153 @@
 
   res = deflateEnd( &strm );
-        
+
   if ( res != Z_OK )
   {
@@ -161 +162 @@
     else
       PRINTF(1)("deflateEnd error: dont know\n");
-    
-    return -1;
-  }
-  
+
+    return -1;
+  }
+
   return zippedlen;
 
@@ -181 +182 @@
   z_stream strm;
   int res = 0;
-  
+
   strm.zalloc = Z_NULL;
   strm.zfree = Z_NULL;
@@ -193 +194 @@
     return -1;
   }
-        
+
   strm.next_out = (Bytef*)to;
   strm.avail_out = maxLength;
@@ -202 +203 @@
 
   assert( inflate( &strm, Z_NO_FLUSH ) == Z_NEED_DICT );
-        
+
   int dictId = -1;
-  
+
   for ( int i = 0; i < dicts.size(); i++ )
   {
@@ -213 +214 @@
     }
   }
-  
+
   if ( dictId == -1 )
   {
@@ -219 +220 @@
     return -1;
   }
-      
+
   res = inflateSetDictionary( &strm, (Bytef*)dicts[dictId].dict, dicts[dictId].dictLen );
-        
+
   if ( res != Z_OK )
   {
@@ -230 +231 @@
 
   res = inflate( &strm, Z_FINISH );
-        
+
   if ( res != Z_STREAM_END )
   {
@@ -243 +244 @@
 
   res = inflateEnd( &strm );
-        
+
   if ( res != Z_OK )
   {
@@ -249 +250 @@
     return -1;
   }
-  
+
   return unzippedlen;
 }