Happy new year

[yaz-moved-to-github.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 11dc8db..4d92e13 100644 (file)
--- 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,7 +15,7 @@
 #include <yaz/options.h>
 
 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)
 {
@@ -24,14 +24,14 @@ int options (const char *desc, char **argv, int argc, char **arg)
     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,11 +102,12 @@ 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:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab