From patchwork Fri May 8 21:23:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Openvpn-devel] get rid of TAG_FILE_INLINE constant X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1108 Message-Id: <20200508212356.18522-1-a@unstable.cc> To: openvpn-devel@lists.sourceforge.net Cc: Antonio Quartulli Date: Fri, 8 May 2020 23:23:56 +0200 From: Antonio Quartulli List-Id: Now that the whole inline logic has been converted to using bool flags, the TAG_FILE_INLINE constant is not useful anymore. Get rid of the constant as it's now unused and to prevent any future developer from mistakenly use it again. Signed-off-by: Antonio Quartulli Acked-by: David Sommerseth --- to be applied after all other fixes, as they remove the few last usages of this constant. src/openvpn/common.h | 6 ------ src/openvpn/crypto.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/openvpn/common.h b/src/openvpn/common.h index 4e6f4809..623b3e0d 100644 --- a/src/openvpn/common.h +++ b/src/openvpn/common.h @@ -88,12 +88,6 @@ typedef unsigned long ptr_type; */ #define PUSH_REQUEST_INTERVAL 5 -/* - * A sort of pseudo-filename for data provided inline within - * the configuration file. - */ -#define INLINE_FILE_TAG "[[INLINE]]" - /* * Script security warning */ diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index 672aa14a..f1a52d8c 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -1189,7 +1189,7 @@ print_key_filename(const char *str, bool is_inline) { if (is_inline) { - return INLINE_FILE_TAG; + return "[[INLINE]]"; } return np(str);