Change logic slightly to avoid one unnecessary calculation. No big deal.

Thomas G. Lockhart · Thomas G. Lockhart · commit ed14f8851227 · 1997-12-23T19:24:43.000Z
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.13 1997/12/16 15:59:09 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.14 1997/12/23 19:24:43 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,12 +49,12 @@
  *	  len is the length specified in () plus VARHDRSZ bytes. (XXX dummy is here
  *	  because we pass typelem as the second argument for array_in.)
  */
-char	   *
+char *
 bpcharin(char *s, int dummy, int typlen)
 {
 	char	   *result,
 			   *r;
-	int			len = typlen - VARHDRSZ;
+	int			len;
 	int			i;
 
 	if (s == NULL)
@@ -69,6 +69,10 @@ bpcharin(char *s, int dummy, int typlen)
 		len = strlen(s);
 		typlen = len + VARHDRSZ;
 	}
+	else
+	{
+		len = typlen - VARHDRSZ;
+	}
 
 	if (len > 4096)
 		elog(WARN, "bpcharin: length of char() must be less than 4096");
@@ -90,7 +94,7 @@ bpcharin(char *s, int dummy, int typlen)
 	return (result);
 }
 
-char	   *
+char *
 bpcharout(char *s)
 {
 	char	   *result;
@@ -150,7 +154,7 @@ varcharin(char *s, int dummy, int typlen)
 	return (result);
 }
 
-char	   *
+char *
 varcharout(char *s)
 {
 	char	   *result;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.13 1997/12/16 15:59:09 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.14 1997/12/23 19:24:43 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -49,12 +49,12 @@`
`49`	`49`	`* len is the length specified in () plus VARHDRSZ bytes. (XXX dummy is here`
`50`	`50`	`* because we pass typelem as the second argument for array_in.)`
`51`	`51`	`*/`
`52`		`-char *`
	`52`	`+char *`
`53`	`53`	`bpcharin(char *s, int dummy, int typlen)`
`54`	`54`	`{`
`55`	`55`	`char *result,`
`56`	`56`	`*r;`
`57`		`- int len = typlen - VARHDRSZ;`
	`57`	`+ int len;`
`58`	`58`	`int i;`
`59`	`59`
`60`	`60`	`if (s == NULL)`
`@@ -69,6 +69,10 @@ bpcharin(char *s, int dummy, int typlen)`
`69`	`69`	`len = strlen(s);`
`70`	`70`	`typlen = len + VARHDRSZ;`
`71`	`71`	`}`
	`72`	`+ else`
	`73`	`+ {`
	`74`	`+ len = typlen - VARHDRSZ;`
	`75`	`+ }`
`72`	`76`
`73`	`77`	`if (len > 4096)`
`74`	`78`	`elog(WARN, "bpcharin: length of char() must be less than 4096");`
`@@ -90,7 +94,7 @@ bpcharin(char *s, int dummy, int typlen)`
`90`	`94`	`return (result);`
`91`	`95`	`}`
`92`	`96`
`93`		`-char *`
	`97`	`+char *`
`94`	`98`	`bpcharout(char *s)`
`95`	`99`	`{`
`96`	`100`	`char *result;`
`@@ -150,7 +154,7 @@ varcharin(char *s, int dummy, int typlen)`
`150`	`154`	`return (result);`
`151`	`155`	`}`
`152`	`156`
`153`		`-char *`
	`157`	`+char *`
`154`	`158`	`varcharout(char *s)`
`155`	`159`	`{`
`156`	`160`	`char *result;`