diff --git a/src/core/ddsi/src/q_config.c b/src/core/ddsi/src/q_config.c index bf1781d..f3ea0a7 100644 --- a/src/core/ddsi/src/q_config.c +++ b/src/core/ddsi/src/q_config.c @@ -33,7 +33,6 @@ #include "dds/ddsi/q_error.h" #include "dds/ddsrt/xmlparser.h" -#include "dds/ddsrt/expand_envvars.h" #include "dds/version.h" diff --git a/src/ddsrt/CMakeLists.txt b/src/ddsrt/CMakeLists.txt index 5b49248..cda6f18 100644 --- a/src/ddsrt/CMakeLists.txt +++ b/src/ddsrt/CMakeLists.txt @@ -79,7 +79,6 @@ list(APPEND sources list(APPEND headers "${source_path}/dds/ddsrt/avl.h" - "${source_path}/dds/ddsrt/expand_envvars.h" "${source_path}/dds/ddsrt/fibheap.h" "${source_path}/dds/ddsrt/hopscotch.h" "${source_path}/dds/ddsrt/thread_pool.h") diff --git a/src/ddsrt/include/dds/ddsrt/expand_envvars.h b/src/ddsrt/include/dds/ddsrt/expand_envvars.h deleted file mode 100644 index d7b66f4..0000000 --- a/src/ddsrt/include/dds/ddsrt/expand_envvars.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright(c) 2006 to 2018 ADLINK Technology Limited and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License - * v. 1.0 which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause - */ -#ifndef DDSRT_EXPAND_ENVVARS_H -#define DDSRT_EXPAND_ENVVARS_H - -#include "dds/export.h" - -#if defined (__cplusplus) -extern "C" { -#endif - - /* Expands ${X}, ${X:-Y}, ${X:+Y}, ${X:?Y} forms, but not $X */ - DDS_EXPORT char *ddsrt_expand_envvars(const char *string); - - /* Expands $X, ${X}, ${X:-Y}, ${X:+Y}, ${X:?Y} forms, $ and \ can be escaped with \ */ - DDS_EXPORT char *ddsrt_expand_envvars_sh(const char *string); - -#if defined (__cplusplus) -} -#endif - -#endif diff --git a/src/ddsrt/src/expand_envvars.c b/src/ddsrt/src/expand_envvars.c index ded0d0a..dbaa33a 100644 --- a/src/ddsrt/src/expand_envvars.c +++ b/src/ddsrt/src/expand_envvars.c @@ -19,7 +19,6 @@ #include "dds/ddsrt/heap.h" #include "dds/ddsrt/log.h" #include "dds/ddsrt/string.h" -#include "dds/ddsrt/expand_envvars.h" typedef char * (*expand_fn)(const char *src0);