summaryrefslogtreecommitdiff
path: root/src/bin/psql/input.c
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2004-01-25 03:07:22 +0000
committerNeil Conway <neilc@samurai.com>2004-01-25 03:07:22 +0000
commite10bb0518a03281f2cb22b2fa41200a56de80d63 (patch)
tree988c3f8dc70975b49d2a97f49a4010d59488f0d9 /src/bin/psql/input.c
parentafe7b7b60ee3047c4665eb27e9252f343e0eff74 (diff)
More fallout from the recent psql patch: rename xmalloc and friends to
pg_malloc, to avoid linker failures on same platforms.
Diffstat (limited to 'src/bin/psql/input.c')
-rw-r--r--src/bin/psql/input.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 6a2afa35bd3..326f91ef679 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.33 2004/01/24 19:38:49 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.34 2004/01/25 03:07:22 neilc Exp $
*/
#include "postgres_fe.h"
#include "input.h"
@@ -113,7 +113,7 @@ gets_interactive(const char *prompt)
else
{
free(prev_hist);
- prev_hist = xstrdup(s);
+ prev_hist = pg_strdup(s);
add_history(s);
}
}
@@ -185,8 +185,8 @@ initializeInput(int flags)
{
char *psql_history;
- psql_history = xmalloc(strlen(home) + 1 +
- strlen(PSQLHISTORY) + 1);
+ psql_history = pg_malloc(strlen(home) + 1 +
+ strlen(PSQLHISTORY) + 1);
sprintf(psql_history, "%s/%s", home, PSQLHISTORY);
read_history(psql_history);
free(psql_history);
@@ -239,8 +239,8 @@ finishInput(int exitstatus, void *arg)
char *psql_history;
int hist_size;
- psql_history = xmalloc(strlen(home) + 1 +
- strlen(PSQLHISTORY) + 1);
+ psql_history = pg_malloc(strlen(home) + 1 +
+ strlen(PSQLHISTORY) + 1);
hist_size = GetVariableNum(pset.vars, "HISTSIZE", -1, -1, true);