database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-13 14:22:43 +03:00
Code Activity

More fallout from the recent psql patch: rename xmalloc and friends to

Browse Source 
pg_malloc, to avoid linker failures on same platforms.
This commit is contained in:
Neil Conway
2004-01-25 03:07:22 +00:00
parent afe7b7b60e
commit e10bb0518a
12 changed files with 108 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/psql/common.c
View File

@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.81 2004/01/24 19:38:49 neilc Exp $
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.82 2004/01/25 03:07:22 neilc Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -70,7 +70,7 @@ static bool is_transact_command(const char *query);
* "Safe" wrapper around strdup()
*/
char *
xstrdup(const char *string)
pg_strdup(const char *string)
{
char *tmp;
@@ -90,7 +90,7 @@ xstrdup(const char *string)
}
void *
xmalloc(size_t size)
pg_malloc(size_t size)
{
void *tmp;
@@ -104,17 +104,17 @@ xmalloc(size_t size)
}
void *
xmalloc_zero(size_t size)
pg_malloc_zero(size_t size)
{
void *tmp;
tmp = xmalloc(size);
tmp = pg_malloc(size);
memset(tmp, 0, size);
return tmp;
}
void *
xcalloc(size_t nmemb, size_t size)
pg_calloc(size_t nmemb, size_t size)
{
void *tmp;
@@ -127,7 +127,6 @@ xcalloc(size_t nmemb, size_t size)
return tmp;
}
/*
* setQFout
* -- handler for -o command line option and \o command
@@ -891,7 +890,7 @@ expand_tilde(char **filename)
{
char *newfn;
newfn = xmalloc(strlen(home) + strlen(p) + 1);
newfn = pg_malloc(strlen(home) + strlen(p) + 1);
strcpy(newfn, home);
strcat(newfn, p);