rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In pg_upgrade, fix a few place that used maloc/free rather than 

pg_malloc/pg_free.
This commit is contained in:
Bruce Momjian 2012-11-24 22:12:39 -05:00
parent bc5430aa95
commit 16e1ae77f9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pg_upgrade/check.c
View File

@ -987,7 +987,7 @@ get_canonical_locale_name(int category, const char *locale)
if (!setlocale(category, save)) if (!setlocale(category, save))
pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save); pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save);
free(save); pg_free(save);
return res; return res;
} }

8
contrib/pg_upgrade/file.c
View File

@ -148,7 +148,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
return -1; return -1;
} }
buffer = (char *) malloc(COPY_BUF_SIZE); buffer = (char *) pg_malloc(COPY_BUF_SIZE);
if (buffer == NULL) if (buffer == NULL)
{ {
@ -171,7 +171,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
int save_errno = errno; int save_errno = errno;
if (buffer != NULL) if (buffer != NULL)
free(buffer); pg_free(buffer);
if (src_fd != 0) if (src_fd != 0)
close(src_fd); close(src_fd);
@ -194,7 +194,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
int save_errno = errno ? errno : ENOSPC; int save_errno = errno ? errno : ENOSPC;
if (buffer != NULL) if (buffer != NULL)
free(buffer); pg_free(buffer);
if (src_fd != 0) if (src_fd != 0)
close(src_fd); close(src_fd);
@ -208,7 +208,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
} }
if (buffer != NULL) if (buffer != NULL)
free(buffer); pg_free(buffer);
if (src_fd != 0) if (src_fd != 0)
close(src_fd); close(src_fd);