/*
- * $Id: zoom-opt.c,v 1.3 2002-01-03 12:18:38 adam Exp $
+ * $Id: zoom-opt.c,v 1.7 2002-06-04 08:33:49 adam Exp $
*
* ZOOM layer for C, options handling
*/
#include "zoom-p.h"
-ZOOM_options ZOOM_options_create (void)
+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)
{
return ZOOM_options_create_with_parent (0);
}
-ZOOM_options ZOOM_options_create_with_parent (ZOOM_options parent)
+
+ZOOM_API(ZOOM_options)
+ZOOM_options_create_with_parent2 (ZOOM_options parent1, ZOOM_options parent2)
{
- ZOOM_options opt = xmalloc (sizeof(*opt));
+ ZOOM_options opt = (ZOOM_options) xmalloc (sizeof(*opt));
opt->refcount = 1;
opt->callback_func = 0;
opt->callback_handle = 0;
opt->entries = 0;
- opt->parent= parent;
- if (parent)
- (parent->refcount)++;
+ opt->parent1= parent1;
+ if (parent1)
+ (parent1->refcount)++;
+ opt->parent2= parent2;
+ if (parent2)
+ (parent2->refcount)++;
return opt;
}
+
void ZOOM_options_addref (ZOOM_options opt)
{
(opt->refcount)++;
}
-ZOOM_options_callback ZOOM_options_set_callback (
+ZOOM_API(ZOOM_options_callback)
+ZOOM_options_set_callback (
ZOOM_options opt,
ZOOM_options_callback callback_func,
void *callback_handle)
return callback_old;
}
-void ZOOM_options_destroy (ZOOM_options opt)
+ZOOM_API(void)
+ZOOM_options_destroy (ZOOM_options opt)
{
if (!opt)
return;
{
struct ZOOM_options_entry *e;
- ZOOM_options_destroy (opt->parent);
+ ZOOM_options_destroy (opt->parent1);
+ ZOOM_options_destroy (opt->parent2);
e = opt->entries;
while (e)
{
}
}
-void ZOOM_options_set (ZOOM_options opt, const char *name, const char *value)
+ZOOM_API(void)
+ZOOM_options_setl (ZOOM_options opt, const char *name, const char *value,
+ int len)
{
struct ZOOM_options_entry **e;
if (!strcmp((*e)->name, name))
{
xfree ((*e)->value);
- (*e)->value = xstrdup(value);
+ (*e)->value = 0;
+ if (value)
+ {
+ (*e)->value = xmalloc (len+1);
+ memcpy ((*e)->value, value, len);
+ (*e)->value[len] = '\0';
+ }
return;
}
e = &(*e)->next;
}
- *e = xmalloc (sizeof(**e));
+ *e = (struct ZOOM_options_entry *) xmalloc (sizeof(**e));
(*e)->name = xstrdup (name);
- (*e)->value = xstrdup (value);
+ (*e)->value = 0;
+ if (value)
+ {
+ (*e)->value = xmalloc (len+1);
+ memcpy ((*e)->value, value, len);
+ (*e)->value[len] = '\0';
+ }
(*e)->next = 0;
}
-const char *ZOOM_options_get (ZOOM_options opt, const char *name)
+ZOOM_API(void)
+ZOOM_options_set (ZOOM_options opt, const char *name, const char *value)
+{
+ ZOOM_options_setl (opt, name, value, value ? strlen(value): 0);
+}
+
+ZOOM_API(const char *)
+ZOOM_options_get (ZOOM_options opt, const char *name)
{
const char *v = 0;
if (!opt)
}
}
if (!v)
- return ZOOM_options_get(opt->parent, name);
+ v = ZOOM_options_get(opt->parent1, name);
+ if (!v)
+ v = ZOOM_options_get(opt->parent2, name);
return v;
}
-int ZOOM_options_get_bool (ZOOM_options opt, const char *name, int defa)
+ZOOM_API(int)
+ZOOM_options_get_bool (ZOOM_options opt, const char *name, int defa)
{
const char *v = ZOOM_options_get (opt, name);
return 0;
}
-int ZOOM_options_get_int (ZOOM_options opt, const char *name, int defa)
+ZOOM_API(int)
+ZOOM_options_get_int (ZOOM_options opt, const char *name, int defa)
{
const char *v = ZOOM_options_get (opt, name);
return atoi(v);
}
-void ZOOM_options_set_int(ZOOM_options opt, const char *name, int value)
+ZOOM_API(void)
+ZOOM_options_set_int(ZOOM_options opt, const char *name, int value)
{
char s[40];