Rename yaz_use_attribute_create to zget_AttributeList_use_string

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

diff --git a/src/initopt.c b/src/initopt.c
index 148880a..01fbd57 100644 (file)
--- a/src/initopt.c
+++ b/src/initopt.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: initopt.c,v 1.3 2004-10-15 00:19:00 adam Exp $
  */
 
 /**
@@ -47,48 +45,57 @@ static struct {
 int yaz_init_opt_encode(Z_Options *opt, const char *opt_str, int *error_pos)
 {
     const char *cp = opt_str;
-    
+
     ODR_MASK_ZERO(opt);
     while (*cp)
     {
-       char this_opt[20];
-       int i, j;
-       if (*cp == ' ' || *cp == ',')
-       {
-           cp++;
-           continue;
-       }
-       for (i = 0; i < (sizeof(this_opt)-1) &&
-                cp[i] && cp[i] != ' ' && cp[i] != ','; i++)
-           this_opt[i] = cp[i];
-       this_opt[i] = 0;
-       for (j = 0; opt_array[j].name; j++)
-       {
-           if (yaz_matchstr(this_opt, opt_array[j].name) == 0)
-           {
-               ODR_MASK_SET(opt, opt_array[j].opt);
-               break;
-           }
-       }
-       if (!opt_array[j].name)
-       {
-           if (error_pos)
-           {
-               *error_pos = cp - opt_str;
-               return -1;
-           }
-       }
-       cp += i;
+        char this_opt[42];
+        size_t i, j;
+        if (*cp == ' ' || *cp == ',')
+        {
+            cp++;
+            continue;
+        }
+        for (i = 0; i < (sizeof(this_opt)-1) &&
+                 cp[i] && cp[i] != ' ' && cp[i] != ','; i++)
+            this_opt[i] = cp[i];
+        this_opt[i] = 0;
+        for (j = 0; opt_array[j].name; j++)
+        {
+            if (yaz_matchstr(this_opt, opt_array[j].name) == 0)
+            {
+                ODR_MASK_SET(opt, opt_array[j].opt);
+                break;
+            }
+        }
+        if (!opt_array[j].name)
+        {
+            if (error_pos)
+            {
+                *error_pos = cp - opt_str;
+                return -1;
+            }
+        }
+        cp += i;
     }
     return 0;
 }
 
 void yaz_init_opt_decode(Z_Options *opt, void (*pr)(const char *name,
-                                                   void *clientData),
-                        void *clientData)
+                                                    void *clientData),
+                         void *clientData)
 {
     int i;
     for (i = 0; opt_array[i].name; i++)
-       if (ODR_MASK_GET(opt, opt_array[i].opt))
-           (*pr)(opt_array[i].name, clientData);
+        if (ODR_MASK_GET(opt, opt_array[i].opt))
+            (*pr)(opt_array[i].name, clientData);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+