lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.11.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 06:00:56 +01:00
parent ddac2f7869
commit bd6a3e4e88
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
31 changed files with 734 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

9
zcmpdiff.cc
View file

@ -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;
}