summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/varlena.c
diff options
context:
space:
mode:
authorThomas G. Lockhart <lockhart@fourpalms.org>1997-12-16 15:59:11 +0000
committerThomas G. Lockhart <lockhart@fourpalms.org>1997-12-16 15:59:11 +0000
commit6316f4d3db11678472430a3e406382faaad71da8 (patch)
tree11da205794ef605b95516a11f0cbfe2afabe48a8 /src/backend/utils/adt/varlena.c
parent6873af55cf15694f684b6040224a276397721f49 (diff)
Define text, varchar, and bpchar string length functions.
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
-rw-r--r--src/backend/utils/adt/varlena.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 580ef561f5b..57cc01295e2 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.24 1997/12/08 04:42:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.25 1997/12/16 15:59:11 thomas Exp $
*
*-------------------------------------------------------------------------
*/
@@ -210,20 +210,14 @@ textout(struct varlena * vlena)
* returns the actual length of a text* (which may be less than
* the VARSIZE of the text*)
*/
-#ifdef NOT_USED
int
textlen(text *t)
{
- int i = 0;
- int max = VARSIZE(t) - VARHDRSZ;
- char *ptr = VARDATA(t);
-
- while (i < max && *ptr++)
- i++;
- return i;
-}
+ if (!PointerIsValid(t))
+ elog(WARN,"Null input to textlen");
-#endif
+ return (VARSIZE(t) - VARHDRSZ);
+} /* textlen() */
/*
* textcat -