Commit: e0f62b095b7955df74d16911e6f7789947eb5d4c - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revisão: e0f62b095b7955df74d16911e6f7789947eb5d4c (tree)
• Hora: 2013-04-23 21:42:24
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Mensagem de Log

Select compressed data streaming filters for use by setup tool.

Mudança Sumário

• modified: ChangeLog
• modified: src/pkgstrm.cpp

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2013-04-23  Keith Marshall  <[e-mail]>
 
+	Select compressed data streaming filters for use by setup tool.
+
+	* src/pkgstrm.cpp [IMPLEMENTATION_LEVEL != PACKAGE_BASE_COMPONENT]:
+	Exclude the implementations of all decompression filters, except...
+	(pkgXzArchiveStream): ...this, together with its requisite methods...
+	(pkgArchiveStream, pkgLzmaArchiveStream): ...from these.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Adapt internet download agent for use by setup tool.
 
 	* src/pkgbase.h: More code rearrangement, exposing...

--- a/src/pkgstrm.cpp
+++ b/src/pkgstrm.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009, 2010, MinGW Project
+ * Copyright (C) 2009, 2010, 2013, MinGW.org Project
  *
  *
  * Implementation of the streaming data filters, which will be used
@@ -32,6 +32,8 @@
  * arising from the use of this software.
  *
  */
+#include "pkgimpl.h"
+
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -80,6 +82,8 @@ int pkgArchiveStream::GetRawData( int fd, uint8_t *buf, size_t max )
   return read( fd, buf, max );
 }
 
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
+
 /*****
  *
  * Class Implementation: pkgRawArchiveStream
@@ -185,6 +189,8 @@ int pkgBzipArchiveStream::Read( char *buf, size_t max )
   return BZ2_bzRead( &bzerror, stream, buf, max );
 }
 
+#endif /* PACKAGE_BASE_COMPONENT */
+
 /*****
  *
  * Class Implementation: pkgLzmaArchiveStream
@@ -222,6 +228,8 @@ void lzma_stream_initialise( lzma_stream *stream )
   stream->avail_in = 0;
 }
 
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
+
 pkgLzmaArchiveStream::pkgLzmaArchiveStream( const char *filename )
 {
   /* The constructor must first open a file stream...
@@ -318,6 +326,8 @@ int pkgLzmaArchiveStream::Read( char *buf, size_t max )
   return max - stream.avail_out;
 }
 
+#endif /* PACKAGE_BASE_COMPONENT */
+
 /*****
  *
  * Class Implementation: pkgXzArchiveStream
@@ -441,6 +451,8 @@ int pkgXzArchiveStream::Read( char *buf, size_t max )
   return max - stream.avail_out;
 }
 
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
+
 /*****
  *
  * Auxiliary function: pkgOpenArchiveStream()
@@ -503,4 +515,6 @@ extern "C" pkgArchiveStream* pkgOpenArchiveStream( const char* filename )
   return new pkgRawArchiveStream( filename );
 }
 
+#endif /* PACKAGE_BASE_COMPONENT */
+
 /* $RCSfile$: end of file */