X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Foptions.c;h=d0811a97731a708262e59a7c83476aee19e5d665;hb=8fba4cf2cac1cc543aa4c1063c78b449ebac44a7;hp=8490e99c38a55c8fef82acbdae803033eb3941a4;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c;p=yaz-moved-to-github.git diff --git a/src/options.c b/src/options.c index 8490e99..d0811a9 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-2011 Index Data * See the file LICENSE for details. */ /** @@ -15,23 +15,23 @@ #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) +int options(const char *desc, char **argv, int argc, char **arg) { const char *opt_buf = 0; size_t i = 0; int ch = 0; if (arg_no >= argc) - return -2; + return YAZ_OPTIONS_EOF; if (arg_off == 0) { while (argv[arg_no][0] == '\0') { arg_no++; if (arg_no >= argc) - return -2; + return YAZ_OPTIONS_EOF; } if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0') { @@ -102,7 +102,7 @@ int options (const char *desc, char **argv, int argc, char **arg) *arg = argv[arg_no]+arg_off-1; arg_no = arg_no + 1; arg_off = 0; - return -1; + return YAZ_OPTIONS_ERROR; } /* * Local variables: