Attachment 875958 Details for Bug 1077716 – Diff between separate and FlightCrew zipios++

[patch] Diff between separate and FlightCrew zipios++

flightcrew-zipios.patch (text/plain), 4.42 KB, created by Ville Skyttä on 2014-03-18 14:38:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 14:38:16 UTC

Size: 4.42 KB

patch

obsolete

>diff -rU1 zipios++/filepath.h zipios++-flightcrew/filepath.h
>--- zipios++/filepath.h	2000-07-12 21:38:12.000000000 +0300
>+++ zipios++-flightcrew/filepath.h	2011-08-11 21:03:56.000000000 +0300
>@@ -22,3 +22,3 @@
>       @param check_exists If true is specified the constructor will
>-      check the existence and type of the path immidiately, instead of
>+      check the existence and type of the path immediately, instead of
>       deferring that task until it is needed. */
>@@ -30,2 +30,4 @@
> 
>+  inline std::string asString() const ;
>+
>   /** Concatenates FilePath objects. A file separator is inserted
>@@ -109,2 +111,6 @@
> 
>+std::string FilePath::asString() const {
>+  return _path ;
>+}
>+
> 
>diff -rU1 zipios++/meta-iostreams.h zipios++-flightcrew/meta-iostreams.h
>--- zipios++/meta-iostreams.h	2014-03-18 16:32:46.196358139 +0200
>+++ zipios++-flightcrew/meta-iostreams.h	2011-08-11 21:03:56.000000000 +0300
>@@ -9,3 +9,8 @@
> #include <fstream>
>+
>+#if defined (HAVE_STD_IOSTREAM) && defined (USE_STD_IOSTREAM)
> #include <sstream>
>+#else
>+#include <strstream>
>+#endif
> 
>Only in zipios++-flightcrew: zipextraction.h
>diff -rU1 zipios++/zipfile.h zipios++-flightcrew/zipfile.h
>--- zipios++/zipfile.h	2001-12-29 01:20:14.000000000 +0200
>+++ zipios++-flightcrew/zipfile.h	2011-08-11 21:03:56.000000000 +0300
>@@ -11,2 +11,3 @@
> #include "zipios++/virtualseeker.h"
>+#include "../../FlightCrew/Misc/BoostFilesystemUse.h"
> 
>@@ -56,2 +57,5 @@
> 		    /* , ios::open_mode mode  = ios::in | ios::binary */ ) ;
>+
>+  explicit ZipFile( const fs::path &name, int s_off = 0, int e_off = 0
>+		    /* , ios::open_mode mode  = ios::in | ios::binary */ ) ;
> 
>diff -rU1 zipios++/ziphead.h zipios++-flightcrew/ziphead.h
>--- zipios++/ziphead.h	2000-09-22 15:02:40.000000000 +0300
>+++ zipios++-flightcrew/ziphead.h	2011-08-11 21:03:56.000000000 +0300
>@@ -172,3 +172,3 @@
> 	cdir_offset      ( _cdir_offset        ),
>-	zip_comment_len  ( _zip_comment.size() ),
>+	zip_comment_len  ( static_cast< uint16 >( _zip_comment.size() ) ),
> 	zip_comment      ( _zip_comment        )  {}
>@@ -181,3 +181,3 @@
>   void setTotalCount( uint16 c )    { cdir_entries = c ; cdir_tot_entries = c ; }
>-  int  eocdOffSetFromEnd() const { return eocd_offset_from_end ; }
>+  int  eocdOffSetFromEnd() const { return static_cast< int >( eocd_offset_from_end ) ; }
>   bool read( vector<unsigned char> &buf, int pos ) ;
>diff -rU1 zipios++/zipheadio.h zipios++-flightcrew/zipheadio.h
>--- zipios++/zipheadio.h	2000-09-20 20:46:59.000000000 +0300
>+++ zipios++-flightcrew/zipheadio.h	2011-08-11 21:03:56.000000000 +0300
>@@ -83,3 +83,3 @@
>     is.read ( reinterpret_cast< char * >( buf ) + rsf, buf_len - rsf ) ;
>-    rsf += is.gcount () ;
>+    rsf += static_cast< int >( is.gcount () ) ;
>   }
>@@ -99,3 +99,3 @@
>     is.read ( reinterpret_cast< char * >( buf ) + rsf, buf_len - rsf ) ;
>-    rsf += is.gcount () ;
>+    rsf += static_cast< int >( is.gcount () ) ;
>   }
>@@ -105,3 +105,3 @@
> inline void writeUint16 ( uint16 host_val, ostream &os ) {
>-  uint16 val = htozl( reinterpret_cast< unsigned char * >( &host_val ) ) ;
>+  uint16 val = static_cast< uint16 >( htozl( reinterpret_cast< unsigned char * >( &host_val ) ) ) ;
>   os.write( reinterpret_cast< char * >( &val ), sizeof( uint16 ) ) ;
>@@ -114,3 +114,3 @@
>     is.read ( buf + rsf, count - rsf ) ;
>-    rsf += is.gcount() ;
>+    rsf += static_cast< int >( is.gcount() ) ;
>   }
>@@ -131,3 +131,3 @@
>     is.read ( reinterpret_cast< char * >( buf ) + rsf, count - rsf ) ;
>-    rsf += is.gcount() ;
>+    rsf += static_cast< int >( is.gcount() ) ;
>   }
>@@ -144,3 +144,3 @@
>     is.read ( reinterpret_cast< char * >( buf ) + rsf, count - rsf ) ;
>-    rsf += is.gcount() ;
>+    rsf += static_cast< int >( is.gcount() ) ;
>   }
>Only in zipios++-flightcrew: zipios-config.h
>Only in zipios++-flightcrew: zipios-config.unix.h
>Only in zipios++: zipios-config.w32
>Only in zipios++-flightcrew: zipios-config.w32.h
>diff -rU1 zipios++/zipios_defs.h zipios++-flightcrew/zipios_defs.h
>--- zipios++/zipios_defs.h	2014-03-18 16:32:46.196358139 +0200
>+++ zipios++-flightcrew/zipios_defs.h	2011-08-11 21:03:56.000000000 +0300
>@@ -3,4 +3,3 @@
> 
>-#include "zipios++/zipios-config.h"
>-#include <stdint.h>
>+#include <boost/cstdint.hpp>
> 
>@@ -8,4 +7,4 @@
> 
>-typedef uint16_t uint16 ;
>-typedef uint32_t uint32 ;
>+typedef boost::uint16_t uint16 ;
>+typedef boost::uint32_t uint32 ;
> 
>@@ -21,3 +20,3 @@
>   Zipios++ - a small C++ library that provides easy access to .zip files.
>-  Copyright (C) 2000  Thomas Søndergaard
>+  Copyright (C) 2000  Thomas Sondergaard
>

Actions: View | Diff

Attachments on bug 1077716: 875958 | 876026