summaryrefslogtreecommitdiff
path: root/src/bin/psql/mainloop.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/mainloop.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/mainloop.c')
-rw-r--r--src/bin/psql/mainloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index d59261fa2bc..b02ffe2a8cc 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.60 2004/01/24 19:38:49 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.61 2004/01/25 03:07:22 neilc Exp $
*/
#include "postgres_fe.h"
#include "mainloop.h"
@@ -144,7 +144,7 @@ MainLoop(FILE *source)
* just returned from editing the line? then just copy to the
* input buffer
*/
- line = xstrdup(query_buf->data);
+ line = pg_strdup(query_buf->data);
resetPQExpBuffer(query_buf);
/* reset parsing state since we are rescanning whole line */
in_xcomment = 0;
@@ -332,7 +332,7 @@ MainLoop(FILE *source)
/* It is a variable, perform substitution */
out_length = strlen(value);
- new = xmalloc(len + out_length - in_length + 1);
+ new = pg_malloc(len + out_length - in_length + 1);
sprintf(new, "%.*s%s%s", i, line, value,
&line[i + thislen + in_length]);