From 4ce2757d33f1acbdd3f32bec58c79032776b2f68 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 15:57:30 +0100 Subject: Merging upstream version 1.5~rc1. Signed-off-by: Daniel Baumann --- carg_parser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'carg_parser.c') diff --git a/carg_parser.c b/carg_parser.c index 7ea8a2f..2958c67 100644 --- a/carg_parser.c +++ b/carg_parser.c @@ -1,4 +1,4 @@ -/* Pdlzip - Data compressor based on the LZMA algorithm +/* Pdlzip - LZMA lossless data compressor Copyright (C) 2010, 2011, 2012, 2013 Antonio Diaz Diaz. This program is free software: you have unlimited permission @@ -72,15 +72,14 @@ static char parse_long_option( struct Arg_parser * const ap, int * const argindp ) { unsigned len; - int index = -1; - int i; + int index = -1, i; char exact = 0, ambig = 0; for( len = 0; opt[len+2] && opt[len+2] != '='; ++len ) ; /* Test all long options for either exact match or abbreviated matches. */ for( i = 0; options[i].code != 0; ++i ) - if( options[i].name && !strncmp( options[i].name, &opt[2], len ) ) + if( options[i].name && strncmp( options[i].name, &opt[2], len ) == 0 ) { if( strlen( options[i].name ) == len ) /* Exact match found */ { index = i; exact = 1; break; } @@ -148,8 +147,7 @@ static char parse_short_option( struct Arg_parser * const ap, while( cind > 0 ) { - int index = -1; - int i; + int index = -1, i; const unsigned char code = opt[cind]; char code_str[2]; code_str[0] = code; code_str[1] = 0; -- cgit v1.2.3