X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foptions.c;h=88c1c925c5c9dcaf9d19505ebe56f9fe5dd4b06d;hp=35f4e6f403d20a325c463006fefa52b5dc659970;hb=0edd22d3d3fb9bafa8795815517e9ad51d51641f;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0 diff --git a/src/options.c b/src/options.c index 35f4e6f..88c1c92 100644 --- a/src/options.c +++ b/src/options.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. */ /** @@ -20,7 +20,7 @@ static int arg_off = 0; int options (const char *desc, char **argv, int argc, char **arg) { const char *opt_buf = 0; - int i = 0; + size_t i = 0; int ch = 0; if (arg_no >= argc) @@ -55,7 +55,7 @@ int options (const char *desc, char **argv, int argc, char **arg) int type = 0; while (desc[i] == '{') { - int i0 = ++i; + size_t i0 = ++i; while (desc[i] && desc[i] != '}') i++; if (opt_buf && (i - i0) == strlen(opt_buf) && @@ -90,9 +90,7 @@ int options (const char *desc, char **argv, int argc, char **arg) } else /* option with no argument */ { - if (argv[arg_no][arg_off]) - arg_off++; - else + if (!argv[arg_no][arg_off]) { arg_off = 0; arg_no++;