X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foptions.c;h=70d621914203eaad600126feebc4ab0aab6fab30;hp=e9e2f68027ed5d7855466873cd5746de2f463ea1;hb=5e1889250160764822014ce89ee19dc84e5ce310;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7 diff --git a/src/options.c b/src/options.c index e9e2f68..70d6219 100644 --- a/src/options.c +++ b/src/options.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ /** @@ -15,7 +15,7 @@ #include static int arg_no = 1; -static int arg_off = 0; +static size_t arg_off = 0; int options (const char *desc, char **argv, int argc, char **arg) { @@ -66,7 +66,7 @@ int options (const char *desc, char **argv, int argc, char **arg) } if (desc[i] == ':') { /* option with string argument */ - type = desc[i++]; + type = desc[i++]; } if (desc_char == ch) { @@ -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++; @@ -109,6 +107,7 @@ int options (const char *desc, char **argv, int argc, char **arg) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab