Vera: revise the dataflow of cppGetc -> vStringPut

masatake · masatake · commit 8d950a8431d6 · 2023-12-19T04:54:20.000+09:00
Close #3771. Did the same as #3796. Signed-off-by: Masatake YAMATO <yamato@redhat.com>
diff --git a/parsers/vera.c b/parsers/vera.c
@@ -1132,7 +1132,7 @@ static void skipToMatch (const char *const pair)
 	while (matchLevel > 0  &&  (c = skipToNonWhite ()) != EOF)
 	{
 		if (CollectingSignature)
-			vStringPut (Signature, c);
+			cppVStringPut (Signature, c);
 		if (c == begin)
 		{
 			++matchLevel;
@@ -1230,11 +1230,11 @@ static void readIdentifier (tokenInfo *const token, const int firstChar)
 
 	do
 	{
-		vStringPut (name, c);
+		cppVStringPut (name, c);
 		if (CollectingSignature)
 		{
 			if (!first)
-				vStringPut (Signature, c);
+				cppVStringPut (Signature, c);
 			first = false;
 		}
 		c = cppGetc ();
@@ -1581,7 +1581,7 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
 	do
 	{
 		int c = skipToNonWhite ();
-		vStringPut (Signature, c);
+		cppVStringPut (Signature, c);
 
 		switch (c)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1132,7 +1132,7 @@ static void skipToMatch (const char *const pair)`
`1132`	`1132`	`while (matchLevel > 0 && (c = skipToNonWhite ()) != EOF)`
`1133`	`1133`	`{`
`1134`	`1134`	`if (CollectingSignature)`
`1135`		`- vStringPut (Signature, c);`
	`1135`	`+ cppVStringPut (Signature, c);`
`1136`	`1136`	`if (c == begin)`
`1137`	`1137`	`{`
`1138`	`1138`	`++matchLevel;`
`@@ -1230,11 +1230,11 @@ static void readIdentifier (tokenInfo *const token, const int firstChar)`
`1230`	`1230`
`1231`	`1231`	`do`
`1232`	`1232`	`{`
`1233`		`- vStringPut (name, c);`
	`1233`	`+ cppVStringPut (name, c);`
`1234`	`1234`	`if (CollectingSignature)`
`1235`	`1235`	`{`
`1236`	`1236`	`if (!first)`
`1237`		`- vStringPut (Signature, c);`
	`1237`	`+ cppVStringPut (Signature, c);`
`1238`	`1238`	`first = false;`
`1239`	`1239`	`}`
`1240`	`1240`	`c = cppGetc ();`
`@@ -1581,7 +1581,7 @@ static int parseParens (statementInfo const st, parenInfo const info)`
`1581`	`1581`	`do`
`1582`	`1582`	`{`
`1583`	`1583`	`int c = skipToNonWhite ();`
`1584`		`- vStringPut (Signature, c);`
	`1584`	`+ cppVStringPut (Signature, c);`
`1585`	`1585`
`1586`	`1586`	`switch (c)`
`1587`	`1587`	`{`