Commit ed14f885 authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

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

parent c06331a4
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment