From 6e01d7d8f65270f174ed4f161a5292aa5b89be0c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 10 Apr 2017 17:19:00 +0200 Subject: Merging upstream version 1.6. Signed-off-by: Daniel Baumann --- zutils.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'zutils.h') diff --git a/zutils.h b/zutils.h index d91ca52..f5d57b5 100644 --- a/zutils.h +++ b/zutils.h @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2016 Antonio Diaz Diaz. + Copyright (C) 2009-2017 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ int readblock( const int fd, uint8_t * const buf, const int size ); int writeblock( const int fd, const uint8_t * const buf, const int size ); -bool feed_data( const int infd, const int outfd, +bool feed_data( const std::string & filename, const int infd, const int outfd, const uint8_t * magic_data, const int magic_size ); struct Children @@ -26,7 +26,8 @@ struct Children pid_t pid[2]; // data feeder, compressor }; bool good_status( const Children & children, const bool finished ); -bool set_data_feeder( int * const infdp, Children & children, int format_index ); +bool set_data_feeder( const std::string & filename, int * const infdp, + Children & children, int format_index ); // Returns format index or -1 if uncompressed // -- cgit v1.2.3