diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:26:56 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:26:56 +0000 |
commit | d7d5dfbcf513f94115990102c56eccf177417889 (patch) | |
tree | 7b47cf460832a31d6e0c34444e7bf1cddacfd02f /zcmpdiff.cc | |
parent | Adding debian version 1.0-1. (diff) | |
download | zutils-d7d5dfbcf513f94115990102c56eccf177417889.tar.xz zutils-d7d5dfbcf513f94115990102c56eccf177417889.zip |
Merging upstream version 1.1~rc2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r-- | zcmpdiff.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zcmpdiff.cc b/zcmpdiff.cc index 6212314..71bcec6 100644 --- a/zcmpdiff.cc +++ b/zcmpdiff.cc @@ -66,13 +66,13 @@ int open_other_instream( std::string & name ) } -void get_format_types( const std::string & arg, int format_types[2] ) +void parse_format_types( const std::string & arg, int format_types[2] ) { const unsigned i = std::min( arg.find( ',' ), arg.size() ); - if( i > 0 ) format_types[0] = get_format_type( arg.substr( 0, i ) ); + if( i > 0 ) format_types[0] = parse_format_type( arg.substr( 0, i ) ); else format_types[0] = -1; if( i + 1 < arg.size() ) format_types[1] = - get_format_type( arg.substr( i + 1 ) ); + parse_format_type( arg.substr( i + 1 ) ); else format_types[1] = -1; } |