X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-opt.c;h=48c0da796e510a3b167efdf3fb1b2382199e18a4;hp=a82b4d07dc750aa0fe88887806e61c41931d0489;hb=9d12e94d17d3c31124221dc914aa36c9d8154643;hpb=1a5d172598ed970a299d142cd2ff536e905659f8

diff --git a/src/zoom-opt.c b/src/zoom-opt.c
index a82b4d0..48c0da7 100644
--- a/src/zoom-opt.c
+++ b/src/zoom-opt.c
@@ -1,35 +1,100 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoom-opt.c,v 1.5 2005-10-17 12:28:20 mike Exp $
  */
 /**
  * \file zoom-opt.c
  * \brief Implements ZOOM options handling
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include "zoom-p.h"
 
 #include <yaz/xmalloc.h>
 
+struct ZOOM_options_entry {
+    char *name;
+    char *value;
+    int len;                  /* of `value', which may contain NULs */
+    struct ZOOM_options_entry *next;
+};
+
+struct ZOOM_options_p {
+    int refcount;
+    void *callback_handle;
+    ZOOM_options_callback callback_func;
+    struct ZOOM_options_entry *entries;
+    ZOOM_options parent1;
+    ZOOM_options parent2;
+};
+
+static void set_value(struct ZOOM_options_entry **e,
+                      const char *value, int len)
+{
+    (*e)->value = 0;
+    (*e)->len = 0;
+    if (value)
+    {
+        (*e)->value = (char *) xmalloc(len+1);
+        memcpy((*e)->value, value, len);
+        (*e)->value[len] = '\0';
+        (*e)->len = len;
+    }
+}
+
+static void append_entry(struct ZOOM_options_entry **e,
+                         const char *name, const char *value, int len)
+{
+    *e = (struct ZOOM_options_entry *) xmalloc(sizeof(**e));
+    (*e)->name = xstrdup(name);
+    set_value(e, value, len);
+    (*e)->next = 0;
+}
+
 ZOOM_API(ZOOM_options)
-ZOOM_options_create_with_parent (ZOOM_options parent)
+    ZOOM_options_dup(ZOOM_options src)
+{
+    if (!src)
+        return 0;
+    else
+    {
+        ZOOM_options dst = ZOOM_options_create();
+        struct ZOOM_options_entry *src_e = src->entries;
+        struct ZOOM_options_entry **dst_e = &dst->entries;
+
+        while(src_e)
+        {
+            append_entry(dst_e, src_e->name, src_e->value, src_e->len);
+            dst_e = &(*dst_e)->next;
+            src_e = src_e->next;
+        }
+        dst->parent1 = ZOOM_options_dup(src->parent1);
+        dst->parent2 = ZOOM_options_dup(src->parent2);
+        return dst;
+    }
+}
+
+ZOOM_API(ZOOM_options)
+    ZOOM_options_create_with_parent(ZOOM_options parent)
 {
     return ZOOM_options_create_with_parent2(parent, 0);
 }
 
 ZOOM_API(ZOOM_options)
-ZOOM_options_create (void)
+    ZOOM_options_create(void)
 {
-    return ZOOM_options_create_with_parent (0);
+    return ZOOM_options_create_with_parent(0);
 }
 
 
 ZOOM_API(ZOOM_options)
-ZOOM_options_create_with_parent2 (ZOOM_options parent1, ZOOM_options parent2)
+    ZOOM_options_create_with_parent2(ZOOM_options parent1,
+                                     ZOOM_options parent2)
 {
-    ZOOM_options opt = (ZOOM_options) xmalloc (sizeof(*opt));
+    ZOOM_options opt = (ZOOM_options) xmalloc(sizeof(*opt));
 
     opt->refcount = 1;
     opt->callback_func = 0;
@@ -45,20 +110,20 @@ ZOOM_options_create_with_parent2 (ZOOM_options parent1, ZOOM_options parent2)
 }
 
 
-void ZOOM_options_addref (ZOOM_options opt)
+void ZOOM_options_addref(ZOOM_options opt)
 {
     (opt->refcount)++;
 }
 
 ZOOM_API(ZOOM_options_callback)
-ZOOM_options_set_callback (
+    ZOOM_options_set_callback (
     ZOOM_options opt,
     ZOOM_options_callback callback_func,
     void *callback_handle)
 {
     ZOOM_options_callback callback_old;
 
-    assert (opt);
+    assert(opt);
     callback_old = opt->callback_func;
     opt->callback_func = callback_func;
     opt->callback_handle = callback_handle;
@@ -66,7 +131,7 @@ ZOOM_options_set_callback (
 }
 
 ZOOM_API(void)
-ZOOM_options_destroy (ZOOM_options opt)
+    ZOOM_options_destroy(ZOOM_options opt)
 {
     if (!opt)
         return;
@@ -74,40 +139,26 @@ ZOOM_options_destroy (ZOOM_options opt)
     if (opt->refcount == 0)
     {
         struct ZOOM_options_entry *e;
-        
-        ZOOM_options_destroy (opt->parent1);
-        ZOOM_options_destroy (opt->parent2);
+
+        ZOOM_options_destroy(opt->parent1);
+        ZOOM_options_destroy(opt->parent2);
         e = opt->entries;
         while (e)
         {
             struct ZOOM_options_entry *e0 = e;
-            xfree (e->name);
-            xfree (e->value);
+            xfree(e->name);
+            xfree(e->value);
             e = e->next;
-            xfree (e0);
+            xfree(e0);
         }
-        xfree (opt);
+        xfree(opt);
     }
 }
 
-/* PRIVATE to ZOOM_options_setl() */
-static void
-_set_value(struct ZOOM_options_entry **e, const char *value, int len)
-{
-    (*e)->value = 0;
-    (*e)->len = 0;
-    if (value)
-    {
-        (*e)->value = (char *) xmalloc (len+1);
-        memcpy ((*e)->value, value, len);
-        (*e)->value[len] = '\0';
-        (*e)->len = len;
-    }
-}
 
 ZOOM_API(void)
-ZOOM_options_setl (ZOOM_options opt, const char *name, const char *value,
-                   int len)
+    ZOOM_options_setl(ZOOM_options opt, const char *name, const char *value,
+                      int len)
 {
     struct ZOOM_options_entry **e;
 
@@ -116,32 +167,33 @@ ZOOM_options_setl (ZOOM_options opt, const char *name, const char *value,
     {
         if (!strcmp((*e)->name, name))
         {
-            xfree ((*e)->value);
-            _set_value(e, value, len);
+            xfree((*e)->value);
+            set_value(e, value, len);
             return;
         }
         e = &(*e)->next;
     }
-    *e = (struct ZOOM_options_entry *) xmalloc (sizeof(**e));
-    (*e)->name = xstrdup (name);
-    _set_value(e, value, len);
-    (*e)->next = 0;
+    append_entry(e, name, value, len);
 }
 
 ZOOM_API(void)
-ZOOM_options_set (ZOOM_options opt, const char *name, const char *value)
+    ZOOM_options_set(ZOOM_options opt, const char *name, const char *value)
 {
-    ZOOM_options_setl (opt, name, value, value ? strlen(value): 0);
+    ZOOM_options_setl(opt, name, value, value ? strlen(value): 0);
 }
 
 ZOOM_API(const char *)
-ZOOM_options_getl (ZOOM_options opt, const char *name, int *lenp)
+    ZOOM_options_getl(ZOOM_options opt, const char *name, int *lenp)
 {
     const char *v = 0;
     if (!opt)
         return 0;
     if (opt->callback_func)
+    {
         v = (*opt->callback_func)(opt->callback_handle, name);
+        if (v)
+            *lenp = strlen(v);
+    }
     if (!v)
     {
         struct ZOOM_options_entry *e;
@@ -161,28 +213,28 @@ ZOOM_options_getl (ZOOM_options opt, const char *name, int *lenp)
 }
 
 ZOOM_API(const char *)
-ZOOM_options_get (ZOOM_options opt, const char *name)
+    ZOOM_options_get(ZOOM_options opt, const char *name)
 {
     int dummy;
     return ZOOM_options_getl(opt, name, &dummy);
 }
 
 ZOOM_API(int)
-ZOOM_options_get_bool (ZOOM_options opt, const char *name, int defa)
+    ZOOM_options_get_bool(ZOOM_options opt, const char *name, int defa)
 {
-    const char *v = ZOOM_options_get (opt, name);
+    const char *v = ZOOM_options_get(opt, name);
 
     if (!v)
         return defa;
-    if (!strcmp (v, "1") || !strcmp(v, "T"))
+    if (!strcmp(v, "1") || !strcmp(v, "T"))
         return 1;
     return 0;
 }
 
 ZOOM_API(int)
-ZOOM_options_get_int (ZOOM_options opt, const char *name, int defa)
+    ZOOM_options_get_int(ZOOM_options opt, const char *name, int defa)
 {
-    const char *v = ZOOM_options_get (opt, name);
+    const char *v = ZOOM_options_get(opt, name);
 
     if (!v || !*v)
         return defa;
@@ -194,12 +246,13 @@ ZOOM_options_set_int(ZOOM_options opt, const char *name, int value)
 {
     char s[40];
 
-    sprintf (s, "%d", value);
-    ZOOM_options_set (opt, name, s);
+    sprintf(s, "%d", value);
+    ZOOM_options_set(opt, name, s);
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab