Remove dead code in formatting.c

j-naylor · pull[bot] · commit 953e977c156c · 2023-12-28T16:39:53.000Z
Remove some code guarded by IS_MINUS() or IS_PLUS(), where the entire stanza is inside an else-block where both of these are false. This should slightly improve test coverage. While at it, remove coding that apparently assumes that unsetting a bit is so expensive that we have to first check if it's already set in the first place. Per Coverity report from Ranier Vilela Analysis and review by Justin Pryzby Discussion: https://www.postgresql.org/message-id/20221223010818.GP1153%40telsasoft.com
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -5664,13 +5664,9 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 		{
 			if (Np->sign != '-')
 			{
-				if (IS_BRACKET(Np->Num) && IS_FILLMODE(Np->Num))
+				if (IS_FILLMODE(Np->Num))
 					Np->Num->flag &= ~NUM_F_BRACKET;
-				if (IS_MINUS(Np->Num))
-					Np->Num->flag &= ~NUM_F_MINUS;
 			}
-			else if (Np->sign != '+' && IS_PLUS(Np->Num))
-				Np->Num->flag &= ~NUM_F_PLUS;
 
 			if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == false)
 				Np->sign_wrote = true;	/* needn't sign */

Original file line number	Diff line number	Diff line change
`@@ -5664,13 +5664,9 @@ NUM_processor(FormatNode node, NUMDesc Num, char *inout,`
`5664`	`5664`	`{`
`5665`	`5665`	`if (Np->sign != '-')`
`5666`	`5666`	`{`
`5667`		`- if (IS_BRACKET(Np->Num) && IS_FILLMODE(Np->Num))`
	`5667`	`+ if (IS_FILLMODE(Np->Num))`
`5668`	`5668`	`Np->Num->flag &= ~NUM_F_BRACKET;`
`5669`		`- if (IS_MINUS(Np->Num))`
`5670`		`- Np->Num->flag &= ~NUM_F_MINUS;`
`5671`	`5669`	`}`
`5672`		`- else if (Np->sign != '+' && IS_PLUS(Np->Num))`
`5673`		`- Np->Num->flag &= ~NUM_F_PLUS;`
`5674`	`5670`
`5675`	`5671`	`if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == false)`
`5676`	`5672`	`Np->sign_wrote = true; /* needn't sign */`