From bae4bd915ac018c4a3ce681067e0a1a51017e418 Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 31 Jul 2018 18:29:25 +0200 Subject: Correct typing error in warning message. --- src/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.cpp b/src/util.cpp index 6c7e3d5..0ebb57f 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2591,7 +2591,7 @@ QCString dateToString(bool includeTime) static bool warnedOnce=FALSE; if (!warnedOnce) { - warn_uncond("Environment variable SOURCE_DATA_EPOCH must have a value smaller than or equal to %llu; actual value %llu\n",UINT_MAX,epoch); + warn_uncond("Environment variable SOURCE_DATE_EPOCH must have a value smaller than or equal to %llu; actual value %llu\n",UINT_MAX,epoch); warnedOnce=TRUE; } } -- cgit v0.12 From 35b7de3e692b127f8192900e1ae1152221afe76b Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 2 Aug 2018 11:50:32 +0200 Subject: Consistency of environment variables between config and code In a configuration file it was possible to have an environment variable like PROGRAMFILES(X86) but in the code this was not possible. --- src/doctokenizer.l | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/doctokenizer.l b/src/doctokenizer.l index e6b8865..cad9a9f 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -658,7 +658,8 @@ REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->text = tagName.mid(text_begin,text_end-text_begin); return TK_RCSTAG; } -"$("{ID}")" { /* environment variable */ +"$("{ID}")" | /* environment variable */ +"$("{ID}"("{ID}"))" { /* environment variable */ QCString name = &yytext[2]; name = name.left(name.length()-1); QCString value = portable_getenv(name); -- cgit v0.12 From b1a7c9f513fd7c15d86d536cad64338dfd2b617c Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 2 Aug 2018 14:54:52 +0200 Subject: Consistency of environment variables between config and code Made consistent with pull request #6420 --- src/doctokenizer.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doctokenizer.l b/src/doctokenizer.l index cad9a9f..0a95661 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -658,8 +658,8 @@ REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->text = tagName.mid(text_begin,text_end-text_begin); return TK_RCSTAG; } -"$("{ID}")" | /* environment variable */ -"$("{ID}"("{ID}"))" { /* environment variable */ +"$("{ID}")" | /* environment variable */ +"$("{ID}"("{ID}"))" { /* environment variable */ QCString name = &yytext[2]; name = name.left(name.length()-1); QCString value = portable_getenv(name); -- cgit v0.12