diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-02-03 11:13:26 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-02-03 11:13:44 +0000 |
| commit | 50250d834c659e3593397cc6ee691d7efc721643 (patch) | |
| tree | b7f3fe28e142413de4866c7a314da8e53827c3f8 /zcmpdiff.cc | |
| parent | Releasing debian version 1.10-2. (diff) | |
| download | zutils-50250d834c659e3593397cc6ee691d7efc721643.tar.xz zutils-50250d834c659e3593397cc6ee691d7efc721643.zip | |
Merging upstream version 1.11.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'zcmpdiff.cc')
| -rw-r--r-- | zcmpdiff.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zcmpdiff.cc b/zcmpdiff.cc index fceb8cf..5688ee2 100644 --- a/zcmpdiff.cc +++ b/zcmpdiff.cc @@ -1,5 +1,5 @@ /* Common code for zcmp and zdiff - Copyright (C) 2010-2021 Antonio Diaz Diaz. + Copyright (C) 2010-2022 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 @@ -50,13 +50,14 @@ int open_other_instream( std::string & name ) } -void parse_format_types2( const std::string & arg, int format_types[2] ) +void parse_format_types2( const std::string & arg, const char * const pn, + int format_types[2] ) { const unsigned i = std::min( arg.find( ',' ), arg.size() ); - if( i > 0 ) format_types[0] = parse_format_type( arg.substr( 0, i ) ); + if( i > 0 ) format_types[0] = parse_format_type( arg.substr( 0, i ), pn ); else format_types[0] = -1; if( i + 1 < arg.size() ) format_types[1] = - parse_format_type( arg.substr( i + 1 ) ); + parse_format_type( arg.substr( i + 1 ), pn ); else format_types[1] = -1; } |