struct parmlist *pctx = talloc_zero(tctx, struct parmlist);
parmlist_set_string(pctx, "bar", "3");
parmlist_set_string(pctx, "notint", "bla");
- torture_assert_int_equal(3, parmlist_get_int(pctx, "bar", 42));
- torture_assert_int_equal(42, parmlist_get_int(pctx, "foo", 42),
+ torture_assert_int_equal(tctx, 3, parmlist_get_int(pctx, "bar", 42),
+ "existing");
+ torture_assert_int_equal(tctx, 42, parmlist_get_int(pctx, "foo", 42),
"default");
- torture_assert_int_equal(0, parmlist_get_int(pctx, "notint", 42)
+ torture_assert_int_equal(tctx, 0, parmlist_get_int(pctx, "notint", 42),
"Not an integer");
return true;
}
+static bool test_get_string(struct torture_context *tctx)
+{
+ struct parmlist *pctx = talloc_zero(tctx, struct parmlist);
+ parmlist_set_string(pctx, "bar", "mystring");
+ torture_assert_str_equal(tctx, "mystring",
+ parmlist_get_string(pctx, "bar", "bla"), "existing");
+ torture_assert_str_equal(tctx, "bla",
+ parmlist_get_string(pctx, "foo", "bla"), "default");
+ return true;
+}
+
+static bool test_get(struct torture_context *tctx)
+{
+ struct parmlist *pctx = talloc_zero(tctx, struct parmlist);
+ struct parmlist_entry *e;
+ parmlist_set_string(pctx, "bar", "mystring");
+
+ e = parmlist_get(pctx, "bar");
+ torture_assert(tctx, e != NULL, "entry");
+ torture_assert_str_equal(tctx, e->key, "bar", "key");
+ torture_assert_str_equal(tctx, e->value, "mystring", "value");
+
+ e = parmlist_get(pctx, "nonexistant");
+ torture_assert(tctx, e == NULL, "nonexistant");
+ return true;
+}
+
+static bool test_get_bool(struct torture_context *tctx)
+{
+ struct parmlist *pctx = talloc_zero(tctx, struct parmlist);
+ parmlist_set_string(pctx, "bar", "true");
+ parmlist_set_string(pctx, "gasoline", "invalid");
+
+ torture_assert(tctx, parmlist_get_bool(pctx, "bar", false), "set");
+ torture_assert(tctx, !parmlist_get_bool(pctx, "foo", false), "default");
+ torture_assert(tctx, !parmlist_get_bool(pctx, "gasoline", false),
+ "invalid");
+ return true;
+}
+
+static bool test_get_string_list(struct torture_context *tctx)
+{
+ struct parmlist *pctx = talloc_zero(tctx, struct parmlist);
+ const char **ret;
+ parmlist_set_string(pctx, "bar", "true, false");
+
+ ret = parmlist_get_string_list(pctx, "bar", NULL);
+ torture_assert_int_equal(tctx, str_list_length(ret), 2, "length");
+ torture_assert_str_equal(tctx, "true", ret[0], "ret[0]");
+ torture_assert_str_equal(tctx, "false", ret[1], "ret[1]");
+ torture_assert(tctx, NULL == parmlist_get_string_list(pctx, "nonexistant", NULL), "nonexistant");
+
+ return true;
+}
+
struct torture_suite *torture_local_util_parmlist(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "PARMLIST");
torture_suite_add_simple_test(suite, "get_int", test_get_int);
+ torture_suite_add_simple_test(suite, "get_string", test_get_string);
+ torture_suite_add_simple_test(suite, "get", test_get);
+ torture_suite_add_simple_test(suite, "get_bool", test_get_bool);
+ torture_suite_add_simple_test(suite, "get_string_list", test_get_string_list);
return suite;
}
int bDisableNetbios;
int bRpcBigEndian;
char *szNTPSignDSocketDirectory;
- struct param_opt *param_opt;
+ struct parmlist_entry *param_opt;
};
int bMSDfsRoot;
int bStrictSync;
int bCIFileSystem;
- struct param_opt *param_opt;
+ struct parmlist_entry *param_opt;
char dummy[3]; /* for alignment */
};
const char *type, const char *option)
{
char *vfskey;
- struct param_opt *data;
+ struct parmlist_entry *data;
if (lp_ctx == NULL)
return NULL;
int i;
struct loadparm_service tservice;
int num_to_alloc = lp_ctx->iNumServices + 1;
- struct param_opt *data, *pdata;
+ struct parmlist_entry *data, *pdata;
tservice = *pservice;
{
int i;
bool bcopyall = (pcopymapDest == NULL);
- struct param_opt *data, *pdata, *paramo;
+ struct parmlist_entry *data, *pdata, *paramo;
bool not_added;
for (i = 0; parm_table[i].label; i++)
pdata = pdata->next;
}
if (not_added) {
- paramo = talloc(pserviceDest, struct param_opt);
+ paramo = talloc(pserviceDest, struct parmlist_entry);
if (paramo == NULL)
smb_panic("OOM");
paramo->key = talloc_reference(paramo, data->key);
const char *pszParmName,
const char *pszParmValue, int flags)
{
- struct param_opt *paramo, *data;
+ struct parmlist_entry *paramo, *data;
char *name;
TALLOC_CTX *mem_ctx;
}
}
- paramo = talloc(mem_ctx, struct param_opt);
+ paramo = talloc(mem_ctx, struct parmlist_entry);
if (!paramo)
smb_panic("OOM");
paramo->key = talloc_strdup(paramo, name);
bool show_defaults)
{
int i;
- struct param_opt *data;
+ struct parmlist_entry *data;
fprintf(f, "# Global parameters\n[global]\n");
static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f)
{
int i;
- struct param_opt *data;
+ struct parmlist_entry *data;
if (pService != sDefault)
fprintf(f, "\n[%s]\n", pService->szService);
static int lp_destructor(struct loadparm_context *lp_ctx)
{
- struct param_opt *data;
+ struct parmlist_entry *data;
if (lp_ctx->globals->param_opt != NULL) {
- struct param_opt *next;
+ struct parmlist_entry *next;
for (data = lp_ctx->globals->param_opt; data; data=next) {
next = data->next;
if (data->priority & FLAG_CMDLINE) continue;