summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/param/generic.c81
-rw-r--r--source4/param/param.h15
2 files changed, 37 insertions, 59 deletions
diff --git a/source4/param/generic.c b/source4/param/generic.c
index ba5464a0f0..802f90764c 100644
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -37,26 +37,9 @@ struct param_section *param_get_section(struct param_context *ctx, const char *n
return NULL;
}
-struct param_opt *param_section_get(struct param_section *section,
- const char *name)
+struct parmlist_entry *param_section_get(struct param_section *section, const char *name)
{
- struct param_opt *p;
-
- for (p = section->parameters; p; p = p->next) {
- if (strcasecmp_m(p->key, name) == 0)
- return p;
- }
-
- return NULL;
-}
-
-struct param_opt *param_get (struct param_context *ctx, const char *name, const char *section_name)
-{
- struct param_section *section = param_get_section(ctx, section_name);
- if (section == NULL)
- return NULL;
-
- return param_section_get(section, name);
+ return parmlist_get(section->parameters, name);
}
struct param_section *param_add_section(struct param_context *ctx, const char *section_name)
@@ -72,10 +55,10 @@ struct param_section *param_add_section(struct param_context *ctx, const char *s
}
/* Look up parameter. If it is not found, add it */
-struct param_opt *param_get_add(struct param_context *ctx, const char *name, const char *section_name)
+struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name)
{
struct param_section *section;
- struct param_opt *p;
+ struct parmlist_entry *p;
SMB_ASSERT(section_name != NULL);
SMB_ASSERT(name != NULL);
@@ -88,30 +71,30 @@ struct param_opt *param_get_add(struct param_context *ctx, const char *name, con
p = param_section_get(section, name);
if (p == NULL) {
- p = talloc_zero(section, struct param_opt);
+ p = talloc_zero(section, struct parmlist_entry);
if (p == NULL)
return NULL;
p->key = talloc_strdup(p, name);
- DLIST_ADD_END(section->parameters, p, struct param_opt *);
+ DLIST_ADD_END(section->parameters->entries, p, struct parmlist_entry *);
}
return p;
}
-const char *param_get_string(struct param_context *ctx, const char *param, const char *section)
+const char *param_get_string(struct param_context *ctx, const char *param, const char *section_name)
{
- struct param_opt *p = param_get(ctx, param, section);
+ struct param_section *section = param_get_section(ctx, section_name);
- if (p == NULL)
+ if (section == NULL)
return NULL;
- return p->value;
+ return parmlist_get_string(section->parameters, param, NULL);
}
int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section)
{
- struct param_opt *p = param_get_add(ctx, param, section);
+ struct parmlist_entry *p = param_get_add(ctx, param, section);
if (p == NULL)
return -1;
@@ -121,38 +104,38 @@ int param_set_string(struct param_context *ctx, const char *param, const char *v
return 0;
}
-const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section)
+const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section_name)
{
- struct param_opt *p = param_get(ctx, param, section);
-
- if (p == NULL)
+ struct param_section *section = param_get_section(ctx, section_name);
+
+ if (section == NULL)
return NULL;
- return (const char **)str_list_make(ctx, p->value, separator);
+ return parmlist_get_string_list(section->parameters, param, separator);
}
int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section)
{
- struct param_opt *p = param_get_add(ctx, param, section);
+ struct parmlist_entry *p = param_get_add(ctx, param, section);
p->value = str_list_join(p, list, ' ');
return 0;
}
-int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section)
+int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section_name)
{
- const char *value = param_get_string(ctx, param, section);
-
- if (value)
- return strtol(value, NULL, 0);
+ struct param_section *section = param_get_section(ctx, section_name);
- return default_v;
+ if (section == NULL)
+ return default_v;
+
+ return parmlist_get_int(section->parameters, param, default_v);
}
void param_set_int(struct param_context *ctx, const char *param, int value, const char *section)
{
- struct param_opt *p = param_get_add(ctx, section, param);
+ struct parmlist_entry *p = param_get_add(ctx, section, param);
if (!p)
return;
@@ -172,7 +155,7 @@ unsigned long param_get_ulong(struct param_context *ctx, const char *param, unsi
void param_set_ulong(struct param_context *ctx, const char *name, unsigned long value, const char *section)
{
- struct param_opt *p = param_get_add(ctx, name, section);
+ struct parmlist_entry *p = param_get_add(ctx, name, section);
if (!p)
return;
@@ -204,16 +187,16 @@ static bool param_sfunc (const char *name, void *_ctx)
static bool param_pfunc (const char *name, const char *value, void *_ctx)
{
struct param_context *ctx = (struct param_context *)_ctx;
- struct param_opt *p = param_section_get(ctx->sections, name);
+ struct parmlist_entry *p = param_section_get(ctx->sections, name);
if (!p) {
- p = talloc_zero(ctx->sections, struct param_opt);
+ p = talloc_zero(ctx->sections, struct parmlist_entry);
if (p == NULL)
return false;
p->key = talloc_strdup(p, name);
p->value = talloc_strdup(p, value);
- DLIST_ADD(ctx->sections->parameters, p);
+ DLIST_ADD(ctx->sections->parameters->entries, p);
} else { /* Replace current value */
talloc_free(p->value);
p->value = talloc_strdup(p, value);
@@ -247,9 +230,9 @@ int param_use(struct loadparm_context *lp_ctx, struct param_context *ctx)
struct param_section *section;
for (section = ctx->sections; section; section = section->next) {
- struct param_opt *param;
+ struct parmlist_entry *param;
bool isglobal = strcmp(section->name, "global") == 0;
- for (param = section->parameters; param; param = param->next) {
+ for (param = section->parameters->entries; param; param = param->next) {
if (isglobal)
lp_do_global_parameter(lp_ctx, param->key,
param->value);
@@ -279,10 +262,10 @@ int param_write(struct param_context *ctx, const char *fn)
return -1;
for (section = ctx->sections; section; section = section->next) {
- struct param_opt *param;
+ struct parmlist_entry *param;
fdprintf(file, "[%s]\n", section->name);
- for (param = section->parameters; param; param = param->next) {
+ for (param = section->parameters->entries; param; param = param->next) {
fdprintf(file, "\t%s = %s\n", param->key, param->value);
}
fdprintf(file, "\n");
diff --git a/source4/param/param.h b/source4/param/param.h
index 27bc32f9b9..5c49f34e2a 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -20,12 +20,7 @@
#ifndef _PARAM_H /* _PARAM_H */
#define _PARAM_H
-struct param_opt {
- struct param_opt *prev, *next;
- char *key;
- char *value;
- int priority;
-};
+#include "../lib/util/parmlist.h"
struct param_context {
struct param_section *sections;
@@ -34,7 +29,7 @@ struct param_context {
struct param_section {
const char *name;
struct param_section *prev, *next;
- struct param_opt *parameters;
+ struct parmlist *parameters;
};
struct param_context;
@@ -334,11 +329,11 @@ struct gensec_settings *lp_gensec_settings(TALLOC_CTX *, struct loadparm_context
/* The following definitions come from param/generic.c */
struct param_section *param_get_section(struct param_context *ctx, const char *name);
-struct param_opt *param_section_get(struct param_section *section,
+struct parmlist_entry *param_section_get(struct param_section *section,
const char *name);
-struct param_opt *param_get (struct param_context *ctx, const char *name, const char *section_name);
+struct parmlist_entry *param_get (struct param_context *ctx, const char *name, const char *section_name);
struct param_section *param_add_section(struct param_context *ctx, const char *section_name);
-struct param_opt *param_get_add(struct param_context *ctx, const char *name, const char *section_name);
+struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name);
const char *param_get_string(struct param_context *ctx, const char *param, const char *section);
int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section);
const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section);
generated by cgit (git 2.34.1) at 2024-12-03 04:35:31 +0000