Refactored expand_vars so that a custom lookup function can be used, which makes it usable for replacing tags by values other than environment variables

Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com>
This commit is contained in:
Dennis Potman 2020-02-24 14:03:25 +01:00 committed by eboasson
parent 24e42fd658
commit b3c5a8d4fc
14 changed files with 180 additions and 49 deletions

View file

@ -96,7 +96,7 @@ dds_entity_t dds_create_participant (const dds_domainid_t domain, const dds_qos_
dds_participant * pp;
ddsi_plist_t plist;
dds_qos_t *new_qos = NULL;
char *config = "";
const char *config = "";
/* Make sure DDS instance is initialized. */
if ((ret = dds_init ()) < 0)

View file

@ -29,7 +29,7 @@
static void config__check_env (const char *env_variable, const char *expected_value)
{
char *env_uri = NULL;
const char *env_uri = NULL;
ddsrt_getenv (env_variable, &env_uri);
#ifdef FORCE_ENV
{

View file

@ -111,7 +111,7 @@ CU_Test(ddsc_participant, create_with_conf_no_env) {
ddsrt_setenv(DDS_PROJECT_NAME_NOSPACE_CAPS"_URI", CONFIG_ENV_SIMPLE_UDP);
ddsrt_setenv("MAX_PARTICIPANTS", CONFIG_ENV_MAX_PARTICIPANTS);
char * env_uri = NULL;
const char * env_uri = NULL;
ddsrt_getenv(DDS_PROJECT_NAME_NOSPACE_CAPS"_URI", &env_uri);
CU_ASSERT_PTR_NOT_EQUAL_FATAL(env_uri, NULL);