From e10bb0518a03281f2cb22b2fa41200a56de80d63 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Sun, 25 Jan 2004 03:07:22 +0000
Subject: More fallout from the recent psql patch: rename xmalloc and friends
 to pg_malloc, to avoid linker failures on same platforms.

---
 src/bin/psql/variables.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/bin/psql/variables.c')

diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 31c5510ad83..e5f5c21deab 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.16 2004/01/24 19:38:49 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.17 2004/01/25 03:07:22 neilc Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -14,9 +14,9 @@ CreateVariableSpace(void)
 {
 	struct _variable *ptr;
 
-	ptr = xcalloc(1, sizeof *ptr);
-	ptr->name = xstrdup("@");
-	ptr->value = xstrdup("");
+	ptr = pg_calloc(1, sizeof *ptr);
+	ptr->name = pg_strdup("@");
+	ptr->value = pg_strdup("");
 
 	return ptr;
 }
@@ -152,14 +152,14 @@ SetVariable(VariableSpace space, const char *name, const char *value)
 		if (strcmp(current->name, name) == 0)
 		{
 			free(current->value);
-			current->value = xstrdup(value);
+			current->value = pg_strdup(value);
 			return true;
 		}
 	}
 
-	previous->next = xcalloc(1, sizeof *(previous->next));
-	previous->next->name = xstrdup(name);
-	previous->next->value = xstrdup(value);
+	previous->next = pg_calloc(1, sizeof *(previous->next));
+	previous->next->name = pg_strdup(name);
+	previous->next->value = pg_strdup(value);
 	return true;
 }
 
-- 
cgit v1.2.3