Fix instances where STRDEF() was used instead of STR().

In practice this didn't cause problems because the string buffer was still valid and strSize() was not being called.
pgbackrest · Apr 21, 2022 · a2eee15 · a2eee15
1 parent 627921c
commit a2eee15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/common/type/string.c b/src/common/type/string.c
@@ -557,7 +557,7 @@ strCmpZ(const String *this, const char *compare)
         FUNCTION_TEST_PARAM(STRINGZ, compare);
     FUNCTION_TEST_END();
 
-    FUNCTION_TEST_RETURN(strCmp(this, compare == NULL ? NULL : STRDEF(compare)));
+    FUNCTION_TEST_RETURN(strCmp(this, compare == NULL ? NULL : STR(compare)));
 }
 
 /**********************************************************************************************************************************/

diff --git a/test/src/common/harnessLog.c b/test/src/common/harnessLog.c
@@ -276,9 +276,9 @@ hrnLogReplaceAdd(const char *expression, const char *expressionSub, const char *
         HarnessLogReplace logReplace =
         {
             .expression = strNewZ(expression),
-            .regExp = regExpNew(STRDEF(expression)),
+            .regExp = regExpNew(STR(expression)),
             .expressionSub = expressionSub == NULL ? NULL : strNewZ(expressionSub),
-            .regExpSub = expressionSub == NULL ? NULL : regExpNew(STRDEF(expressionSub)),
+            .regExpSub = expressionSub == NULL ? NULL : regExpNew(STR(expressionSub)),
             .replacement = strNewZ(replacement),
             .matchList = strLstNew(),
             .version = version,