database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Use calloc() to allocate empty structures.

Browse Source 
Fix pg_restore tar log output bug where Special flag wasn't being
initialized; bug seen on XP.
This commit is contained in:
Bruce Momjian
2003-10-08 03:52:32 +00:00
parent b8382c2688
commit bdae05f5d1
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/pg_dump/pg_backup_custom.c
View File

@ -19,7 +19,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.25 2003/08/04 00:43:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.26 2003/10/08 03:52:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -136,7 +136,7 @@ InitArchiveFmt_Custom(ArchiveHandle *AH)
/* /*
* Set up some special context used in compressing data. * Set up some special context used in compressing data.
*/ */
ctx = (lclContext *) malloc(sizeof(lclContext)); ctx = (lclContext *) calloc(1, sizeof(lclContext));
if (ctx == NULL) if (ctx == NULL)
die_horribly(AH, modulename, "out of memory\n"); die_horribly(AH, modulename, "out of memory\n");
AH->formatData = (void *) ctx; AH->formatData = (void *) ctx;
@ -253,7 +253,7 @@ _ReadExtraToc(ArchiveHandle *AH, TocEntry *te)
if (ctx == NULL) if (ctx == NULL)
{ {
ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry)); ctx = (lclTocEntry *) calloc(1, sizeof(lclTocEntry));
te->formatData = (void *) ctx; te->formatData = (void *) ctx;
} }

8
src/bin/pg_dump/pg_backup_files.c
View File

@ -20,7 +20,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.21 2002/10/25 01:33:17 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.22 2003/10/08 03:52:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -101,7 +101,7 @@ InitArchiveFmt_Files(ArchiveHandle *AH)
/* /*
* Set up some special context used in compressing data. * Set up some special context used in compressing data.
*/ */
ctx = (lclContext *) malloc(sizeof(lclContext)); ctx = (lclContext *) calloc(1, sizeof(lclContext));
AH->formatData = (void *) ctx; AH->formatData = (void *) ctx;
ctx->filePos = 0; ctx->filePos = 0;
@ -167,7 +167,7 @@ _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
lclTocEntry *ctx; lclTocEntry *ctx;
char fn[K_STD_BUF_SIZE]; char fn[K_STD_BUF_SIZE];
ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry)); ctx = (lclTocEntry *) calloc(1, sizeof(lclTocEntry));
if (te->dataDumper) if (te->dataDumper)
{ {
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
@ -206,7 +206,7 @@ _ReadExtraToc(ArchiveHandle *AH, TocEntry *te)
if (ctx == NULL) if (ctx == NULL)
{ {
ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry)); ctx = (lclTocEntry *) calloc(1, sizeof(lclTocEntry));
te->formatData = (void *) ctx; te->formatData = (void *) ctx;
} }

11
src/bin/pg_dump/pg_backup_tar.c
View File

@ -16,7 +16,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.37 2003/08/04 00:43:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.38 2003/10/08 03:52:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -158,10 +158,11 @@ InitArchiveFmt_Tar(ArchiveHandle *AH)
/* /*
* Set up some special context used in compressing data. * Set up some special context used in compressing data.
*/ */
ctx = (lclContext *) malloc(sizeof(lclContext)); ctx = (lclContext *) calloc(1, sizeof(lclContext));
AH->formatData = (void *) ctx; AH->formatData = (void *) ctx;
ctx->filePos = 0; ctx->filePos = 0;
ctx->isSpecialScript = 0;
/* Initialize LO buffering */ /* Initialize LO buffering */
AH->lo_buf_size = LOBBUFSIZE; AH->lo_buf_size = LOBBUFSIZE;
AH->lo_buf = (void *) malloc(LOBBUFSIZE); AH->lo_buf = (void *) malloc(LOBBUFSIZE);
@ -253,7 +254,7 @@ _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
lclTocEntry *ctx; lclTocEntry *ctx;
char fn[K_STD_BUF_SIZE]; char fn[K_STD_BUF_SIZE];
ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry)); ctx = (lclTocEntry *) calloc(1, sizeof(lclTocEntry));
if (te->dataDumper != NULL) if (te->dataDumper != NULL)
{ {
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
@ -292,7 +293,7 @@ _ReadExtraToc(ArchiveHandle *AH, TocEntry *te)
if (ctx == NULL) if (ctx == NULL)
{ {
ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry)); ctx = (lclTocEntry *) calloc(1, sizeof(lclTocEntry));
te->formatData = (void *) ctx; te->formatData = (void *) ctx;
} }

11
src/bin/pg_dump/pg_dump.c
View File

@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.352 2003/09/27 22:10:01 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.353 2003/10/08 03:52:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1078,7 +1078,7 @@ dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout,
write_msg(NULL, "preparing to dump the contents of table %s\n", write_msg(NULL, "preparing to dump the contents of table %s\n",
classname); classname);
dumpCtx = (DumpContext *) malloc(sizeof(DumpContext)); dumpCtx = (DumpContext *) calloc(1, sizeof(DumpContext));
dumpCtx->tblinfo = (TableInfo *) tblinfo; dumpCtx->tblinfo = (TableInfo *) tblinfo;
dumpCtx->tblidx = i; dumpCtx->tblidx = i;
dumpCtx->oids = oids; dumpCtx->oids = oids;
@ -1938,9 +1938,7 @@ getFuncs(int *numFuncs)
*numFuncs = ntups; *numFuncs = ntups;
finfo = (FuncInfo *) malloc(ntups * sizeof(FuncInfo)); finfo = (FuncInfo *) calloc(ntups, sizeof(FuncInfo));
memset((char *) finfo, 0, ntups * sizeof(FuncInfo));
i_oid = PQfnumber(res, "oid"); i_oid = PQfnumber(res, "oid");
i_proname = PQfnumber(res, "proname"); i_proname = PQfnumber(res, "proname");
@ -2144,8 +2142,7 @@ getTables(int *numTables)
* dumping only one, because we don't yet know which tables might be * dumping only one, because we don't yet know which tables might be
* inheritance ancestors of the target table. * inheritance ancestors of the target table.
*/ */
tblinfo = (TableInfo *) malloc(ntups * sizeof(TableInfo)); tblinfo = (TableInfo *) calloc(ntups, sizeof(TableInfo));
memset(tblinfo, 0, ntups * sizeof(TableInfo));
i_reloid = PQfnumber(res, "oid"); i_reloid = PQfnumber(res, "oid");
i_relname = PQfnumber(res, "relname"); i_relname = PQfnumber(res, "relname");