>From 39b216012c4bc8d17bb15802c240cc02ec8c06d9 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 28 Feb 2014 23:42:19 +0100 Subject: [PATCH 1/3] UTIL: Add function sss_parse_name_const Variable with type 'const char *' can be used as output argument in function sss_parse_name, but there will be warning. warning: passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers] --- src/util/usertools.c | 22 ++++++++++++++++++++++ src/util/util.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/src/util/usertools.c b/src/util/usertools.c index ea2123061d36bada99bfca71b18b11efd2e343e0..c69e7298434970717396e0c735d71e015206f821 100644 --- a/src/util/usertools.c +++ b/src/util/usertools.c @@ -366,6 +366,28 @@ int sss_parse_name(TALLOC_CTX *memctx, return EOK; } +int sss_parse_name_const(TALLOC_CTX *memctx, + struct sss_names_ctx *snctx, const char *orig, + const char **_domain, const char **_name) +{ + char *domain; + char *name; + int ret; + + ret = sss_parse_name(memctx, snctx, orig, + (_domain == NULL) ? NULL : &domain, + (_name == NULL) ? NULL : &name); + if (_domain != NULL) { + *_domain = domain; + } + + if (_name != NULL) { + *_name = name; + } + + return ret; +} + static struct sss_domain_info * match_any_domain_or_subdomain_name( struct sss_domain_info *dom, const char *dmatch) diff --git a/src/util/util.h b/src/util/util.h index 54c6c6c78b87398da66e276d67a04f4558cec790..f08690b63d91f8253505e16c41c101026f2fb950 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -279,6 +279,10 @@ int sss_parse_name(TALLOC_CTX *memctx, struct sss_names_ctx *snctx, const char *orig, char **_domain, char **_name); +int sss_parse_name_const(TALLOC_CTX *memctx, + struct sss_names_ctx *snctx, const char *orig, + const char **_domain, const char **_name); + int sss_parse_name_for_domains(TALLOC_CTX *memctx, struct sss_domain_info *domains, const char *default_domain, -- 1.9.0