sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

param: Simplify get_parametric_helper()

Browse Source 
With variable sized arrays we don't need talloc_asprintf here

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Nov 27 01:41:09 CET 2014 on sn-devel-104
This commit is contained in:
Volker Lendecke 2014-11-26 21:35:27 +01:00 committed by Jeremy Allison
parent 46f27a8f78
commit 733422c611
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/param/loadparm.c
View File

@ -241,16 +241,12 @@ struct parmlist_entry *get_parametric_helper(struct loadparm_service *service,
const char *type, const char *option,
struct parmlist_entry *global_opts)
{
char* param_key;
size_t type_len = strlen(type);
size_t option_len = strlen(option);
char param_key[type_len + option_len + 2];
struct parmlist_entry *data = NULL;
TALLOC_CTX *mem_ctx = talloc_stackframe();
param_key = talloc_asprintf(mem_ctx, "%s:%s", type, option);
if (param_key == NULL) {
DEBUG(0,("asprintf failed!\n"));
TALLOC_FREE(mem_ctx);
return NULL;
}
snprintf(param_key, sizeof(param_key), "%s:%s", type, option);
/*
* Try to fetch the option from the data.
@ -259,7 +255,6 @@ struct parmlist_entry *get_parametric_helper(struct loadparm_service *service,
data = service->param_opt;
while (data != NULL) {
if (strwicmp(data->key, param_key) == 0) {
TALLOC_FREE(mem_ctx);
return data;
}
data = data->next;
@ -272,18 +267,12 @@ struct parmlist_entry *get_parametric_helper(struct loadparm_service *service,
data = global_opts;
while (data != NULL) {
if (strwicmp(data->key, param_key) == 0) {
TALLOC_FREE(mem_ctx);
return data;
}
data = data->next;
}
TALLOC_FREE(mem_ctx);
return NULL;
}
const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,