More formatting.c cleanups.

bmomjian · bmomjian · commit 63f850cd4dd3 · 2005-08-17T22:06:53.000Z
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.96 2005/08/17 21:54:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.97 2005/08/17 22:06:53 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group
@@ -4461,8 +4461,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
 #endif
 		return Np->number;
 	}
-
-	return NULL;
 }
 
 /* ----------
@@ -4639,7 +4637,6 @@ numeric_to_char(PG_FUNCTION_ARGS)
 
 		if (Num.pre > len)
 			plen = Num.pre - len;
-
 		else if (len > Num.pre)
 		{
 			fill_str(numstr, '#', Num.pre);
@@ -4847,10 +4844,7 @@ float4_to_char(PG_FUNCTION_ARGS)
 	NUM_TOCHAR_prepare;
 
 	if (IS_ROMAN(&Num))
-	{
 		numstr = orgnum = int_to_roman((int) rint(value));
-
-	}
 	else
 	{
 		float4		val = value;
@@ -4891,7 +4885,6 @@ float4_to_char(PG_FUNCTION_ARGS)
 
 		if (Num.pre > len)
 			plen = Num.pre - len;
-
 		else if (len > Num.pre)
 		{
 			fill_str(numstr, '#', Num.pre);
@@ -4928,10 +4921,7 @@ float8_to_char(PG_FUNCTION_ARGS)
 	NUM_TOCHAR_prepare;
 
 	if (IS_ROMAN(&Num))
-	{
 		numstr = orgnum = int_to_roman((int) rint(value));
-
-	}
 	else
 	{
 		float8		val = value;
@@ -4970,7 +4960,6 @@ float8_to_char(PG_FUNCTION_ARGS)
 
 		if (Num.pre > len)
 			plen = Num.pre - len;
-
 		else if (len > Num.pre)
 		{
 			fill_str(numstr, '#', Num.pre);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -----------------------------------------------------------------------`
`2`	`2`	`* formatting.c`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.96 2005/08/17 21:54:50 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.97 2005/08/17 22:06:53 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group`
`@@ -4461,8 +4461,6 @@ NUM_processor(FormatNode node, NUMDesc Num, char inout, char number,`
`4461`	`4461`	`#endif`
`4462`	`4462`	`return Np->number;`
`4463`	`4463`	`}`
`4464`		`-`
`4465`		`- return NULL;`
`4466`	`4464`	`}`
`4467`	`4465`
`4468`	`4466`	`/* ----------`
`@@ -4639,7 +4637,6 @@ numeric_to_char(PG_FUNCTION_ARGS)`
`4639`	`4637`
`4640`	`4638`	`if (Num.pre > len)`
`4641`	`4639`	`plen = Num.pre - len;`
`4642`		`-`
`4643`	`4640`	`else if (len > Num.pre)`
`4644`	`4641`	`{`
`4645`	`4642`	`fill_str(numstr, '#', Num.pre);`
`@@ -4847,10 +4844,7 @@ float4_to_char(PG_FUNCTION_ARGS)`
`4847`	`4844`	`NUM_TOCHAR_prepare;`
`4848`	`4845`
`4849`	`4846`	`if (IS_ROMAN(&Num))`
`4850`		`- {`
`4851`	`4847`	`numstr = orgnum = int_to_roman((int) rint(value));`
`4852`		`-`
`4853`		`- }`
`4854`	`4848`	`else`
`4855`	`4849`	`{`
`4856`	`4850`	`float4 val = value;`
`@@ -4891,7 +4885,6 @@ float4_to_char(PG_FUNCTION_ARGS)`
`4891`	`4885`
`4892`	`4886`	`if (Num.pre > len)`
`4893`	`4887`	`plen = Num.pre - len;`
`4894`		`-`
`4895`	`4888`	`else if (len > Num.pre)`
`4896`	`4889`	`{`
`4897`	`4890`	`fill_str(numstr, '#', Num.pre);`
`@@ -4928,10 +4921,7 @@ float8_to_char(PG_FUNCTION_ARGS)`
`4928`	`4921`	`NUM_TOCHAR_prepare;`
`4929`	`4922`
`4930`	`4923`	`if (IS_ROMAN(&Num))`
`4931`		`- {`
`4932`	`4924`	`numstr = orgnum = int_to_roman((int) rint(value));`
`4933`		`-`
`4934`		`- }`
`4935`	`4925`	`else`
`4936`	`4926`	`{`
`4937`	`4927`	`float8 val = value;`
`@@ -4970,7 +4960,6 @@ float8_to_char(PG_FUNCTION_ARGS)`
`4970`	`4960`
`4971`	`4961`	`if (Num.pre > len)`
`4972`	`4962`	`plen = Num.pre - len;`
`4973`		`-`
`4974`	`4963`	`else if (len > Num.pre)`
`4975`	`4964`	`{`
`4976`	`4965`	`fill_str(numstr, '#', Num.pre);`