Simplify and standardize conversions between TEXT datums and ordinary C

strings.  This patch introduces four support functions cstring_to_text,
cstring_to_text_with_len, text_to_cstring, and text_to_cstring_buffer, and
two macros CStringGetTextDatum and TextDatumGetCString.  A number of
existing macros that provided variants on these themes were removed.

Most of the places that need to make such conversions now require just one
function or macro call, in place of the multiple notational layers that used
to be needed.  There are no longer any direct calls of textout or textin,
and we got most of the places that were using handmade conversions via
memcpy (there may be a few still lurking, though).

This commit doesn't make any serious effort to eliminate transient memory
leaks caused by detoasting toasted text objects before they reach
text_to_cstring.  We changed PG_GETARG_TEXT_P to PG_GETARG_TEXT_PP in a few
places where it was easy, but much more could be done.

Brendan Jurd and Tom Lane

1 files changed, 14 insertions, 51 deletions

diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index 6e2963ff247..04c90d8672f 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.c,v 1.26 2007/02/27 23:48:06 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.c,v 1.27 2008/03/25 22:42:41 tgl Exp $
  */
 
 #include "postgres.h"
@@ -35,6 +35,7 @@
 
 #include "fmgr.h"
 #include "parser/scansup.h"
+#include "utils/builtins.h"
 
 #include "px.h"
 #include "px-crypt.h"
@@ -132,30 +133,20 @@ PG_FUNCTION_INFO_V1(pg_gen_salt);
 Datum
 pg_gen_salt(PG_FUNCTION_ARGS)
 {
-	text	   *arg0;
+	text	   *arg0 = PG_GETARG_TEXT_PP(0);
 	int			len;
-	text	   *res;
 	char		buf[PX_MAX_SALT_LEN + 1];
 
-	arg0 = PG_GETARG_TEXT_P(0);
-
-	len = VARSIZE(arg0) - VARHDRSZ;
-	len = len > PX_MAX_SALT_LEN ? PX_MAX_SALT_LEN : len;
-	memcpy(buf, VARDATA(arg0), len);
-	buf[len] = 0;
+	text_to_cstring_buffer(arg0, buf, sizeof(buf));
 	len = px_gen_salt(buf, buf, 0);
 	if (len < 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("gen_salt: %s", px_strerror(len))));
 
-	res = (text *) palloc(len + VARHDRSZ);
-	SET_VARSIZE(res, len + VARHDRSZ);
-	memcpy(VARDATA(res), buf, len);
-
 	PG_FREE_IF_COPY(arg0, 0);
 
-	PG_RETURN_TEXT_P(res);
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(buf, len));
 }
 
 /* SQL function: pg_gen_salt(text, int4) returns text */
@@ -164,32 +155,21 @@ PG_FUNCTION_INFO_V1(pg_gen_salt_rounds);
 Datum
 pg_gen_salt_rounds(PG_FUNCTION_ARGS)
 {
-	text	   *arg0;
-	int			rounds;
+	text	   *arg0 = PG_GETARG_TEXT_PP(0);
+	int			rounds = PG_GETARG_INT32(1);
 	int			len;
-	text	   *res;
 	char		buf[PX_MAX_SALT_LEN + 1];
 
-	arg0 = PG_GETARG_TEXT_P(0);
-	rounds = PG_GETARG_INT32(1);
-
-	len = VARSIZE(arg0) - VARHDRSZ;
-	len = len > PX_MAX_SALT_LEN ? PX_MAX_SALT_LEN : len;
-	memcpy(buf, VARDATA(arg0), len);
-	buf[len] = 0;
+	text_to_cstring_buffer(arg0, buf, sizeof(buf));
 	len = px_gen_salt(buf, buf, rounds);
 	if (len < 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("gen_salt: %s", px_strerror(len))));
 
-	res = (text *) palloc(len + VARHDRSZ);
-	SET_VARSIZE(res, len + VARHDRSZ);
-	memcpy(VARDATA(res), buf, len);
-
 	PG_FREE_IF_COPY(arg0, 0);
 
-	PG_RETURN_TEXT_P(res);
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(buf, len));
 }
 
 /* SQL function: pg_crypt(psw:text, salt:text) returns text */
@@ -198,30 +178,16 @@ PG_FUNCTION_INFO_V1(pg_crypt);
 Datum
 pg_crypt(PG_FUNCTION_ARGS)
 {
-	text	   *arg0;
-	text	   *arg1;
-	unsigned	len0,
-				len1,
-				clen;
+	text	   *arg0 = PG_GETARG_TEXT_PP(0);
+	text	   *arg1 = PG_GETARG_TEXT_PP(1);
 	char	   *buf0,
 			   *buf1,
 			   *cres,
 			   *resbuf;
 	text	   *res;
 
-	arg0 = PG_GETARG_TEXT_P(0);
-	arg1 = PG_GETARG_TEXT_P(1);
-	len0 = VARSIZE(arg0) - VARHDRSZ;
-	len1 = VARSIZE(arg1) - VARHDRSZ;
-
-	buf0 = palloc(len0 + 1);
-	buf1 = palloc(len1 + 1);
-
-	memcpy(buf0, VARDATA(arg0), len0);
-	memcpy(buf1, VARDATA(arg1), len1);
-
-	buf0[len0] = '\0';
-	buf1[len1] = '\0';
+	buf0 = text_to_cstring(arg0);
+	buf1 = text_to_cstring(arg1);
 
 	resbuf = palloc0(PX_MAX_CRYPT);
 
@@ -235,11 +201,8 @@ pg_crypt(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_EXTERNAL_ROUTINE_INVOCATION_EXCEPTION),
 				 errmsg("crypt(3) returned NULL")));
 
-	clen = strlen(cres);
+	res = cstring_to_text(cres);
 
-	res = (text *) palloc(clen + VARHDRSZ);
-	SET_VARSIZE(res, clen + VARHDRSZ);
-	memcpy(VARDATA(res), cres, clen);
 	pfree(resbuf);
 
 	PG_FREE_IF_COPY(arg0, 0);