diff options
| author | Neil Conway <neilc@samurai.com> | 2004-01-25 03:07:22 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-01-25 03:07:22 +0000 |
| commit | e10bb0518a03281f2cb22b2fa41200a56de80d63 (patch) | |
| tree | 988c3f8dc70975b49d2a97f49a4010d59488f0d9 /src/bin/psql/variables.c | |
| parent | afe7b7b60ee3047c4665eb27e9252f343e0eff74 (diff) | |
| download | postgresql-e10bb0518a03281f2cb22b2fa41200a56de80d63.tar.gz postgresql-e10bb0518a03281f2cb22b2fa41200a56de80d63.zip | |
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/variables.c')
| -rw-r--r-- | src/bin/psql/variables.c | 16 |
1 files changed, 8 insertions, 8 deletions
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; } |