From d90600b46cc73b745cf6be462d842062e3548e4d Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 2 Mar 2015 16:23:12 +0100 Subject: [PATCH] avoid warnings on type of the parameter used for the allocation pool --- src/cfg.h | 2 +- src/subconfig.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cfg.h b/src/cfg.h index 77b07d07..b564be5b 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -48,7 +48,7 @@ typedef struct pam_cfg_st { #define CHECK_TRUE(str) (str != NULL && (c_strcasecmp(str, "true") == 0 || c_strcasecmp(str, "yes") == 0))?1:0 -void *get_brackets_string1(struct perm_cfg_st *config, const char *str); +void *get_brackets_string1(void *pool, const char *str); void *gssapi_get_brackets_string(struct perm_cfg_st *config, const char *str); void *radius_get_brackets_string(struct perm_cfg_st *config, const char *str); void *pam_get_brackets_string(struct perm_cfg_st *config, const char *str); diff --git a/src/subconfig.c b/src/subconfig.c index 38af73c5..da695979 100644 --- a/src/subconfig.c +++ b/src/subconfig.c @@ -127,7 +127,7 @@ void *gssapi_get_brackets_string(struct perm_cfg_st *config, const char *str) } #endif -void *get_brackets_string1(struct perm_cfg_st *config, const char *str) +void *get_brackets_string1(void *pool, const char *str) { char *p, *p2; unsigned len; @@ -151,11 +151,11 @@ void *get_brackets_string1(struct perm_cfg_st *config, const char *str) len = p2 - p; - return talloc_strndup(config, p, len); + return talloc_strndup(pool, p, len); } #ifdef HAVE_RADIUS -static void *get_brackets_string2(struct perm_cfg_st *config, const char *str) +static void *get_brackets_string2(void *pool, const char *str) { char *p, *p2; unsigned len; @@ -186,7 +186,7 @@ static void *get_brackets_string2(struct perm_cfg_st *config, const char *str) len = p2 - p; - return talloc_strndup(config, p, len); + return talloc_strndup(pool, p, len); } void *radius_get_brackets_string(struct perm_cfg_st *config, const char *str)