diff options
Diffstat (limited to 'src/bin/pg_dump')
| -rw-r--r-- | src/bin/pg_dump/common.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_files.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_tar.c | 6 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump_sort.c | 12 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index a631f64c36f..7eff05fcedf 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -650,8 +650,8 @@ buildIndexArray(void *objArray, int numObjs, Size objSize) static int DOCatalogIdCompare(const void *p1, const void *p2) { - DumpableObject *obj1 = *(DumpableObject **) p1; - DumpableObject *obj2 = *(DumpableObject **) p2; + const DumpableObject *obj1 = *(DumpableObject * const *) p1; + const DumpableObject *obj2 = *(DumpableObject * const *) p2; int cmpval; /* diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 1611551638b..f47af264cba 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -1393,7 +1393,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) } else if (AH->gzOut) { - res = GZWRITE((void *) ptr, size, nmemb, AH->OF); + res = GZWRITE(ptr, size, nmemb, AH->OF); if (res != (nmemb * size)) die_horribly(AH, modulename, "could not write to output file: %s\n", strerror(errno)); return res; @@ -1416,7 +1416,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) return ExecuteSqlCommandBuf(AH, (const char *) ptr, size * nmemb); else { - res = fwrite((void *) ptr, size, nmemb, AH->OF); + res = fwrite(ptr, size, nmemb, AH->OF); if (res != nmemb) die_horribly(AH, modulename, "could not write to output file: %s\n", strerror(errno)); diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c index abc93b14030..afd53bff8e2 100644 --- a/src/bin/pg_dump/pg_backup_files.c +++ b/src/bin/pg_dump/pg_backup_files.c @@ -268,7 +268,7 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen) { lclTocEntry *tctx = (lclTocEntry *) AH->currToc->formatData; - GZWRITE((void *) data, 1, dLen, tctx->FH); + GZWRITE(data, 1, dLen, tctx->FH); return dLen; } diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index 45aab1e2364..4642132d715 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -581,7 +581,7 @@ tarWrite(const void *buf, size_t len, TAR_MEMBER *th) size_t res; if (th->zFH != NULL) - res = GZWRITE((void *) buf, 1, len, th->zFH); + res = GZWRITE(buf, 1, len, th->zFH); else res = fwrite(buf, 1, len, th->nFH); @@ -598,7 +598,7 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen) { lclTocEntry *tctx = (lclTocEntry *) AH->currToc->formatData; - dLen = tarWrite((void *) data, dLen, tctx->TH); + dLen = tarWrite(data, dLen, tctx->TH); return dLen; } @@ -797,7 +797,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len) lclContext *ctx = (lclContext *) AH->formatData; size_t res; - res = tarWrite((void *) buf, len, ctx->FH); + res = tarWrite(buf, len, ctx->FH); ctx->filePos += res; return res; } diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index 963f734dce2..efde0d0026b 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -138,8 +138,8 @@ sortDumpableObjectsByTypeName(DumpableObject **objs, int numObjs) static int DOTypeNameCompare(const void *p1, const void *p2) { - DumpableObject *obj1 = *(DumpableObject **) p1; - DumpableObject *obj2 = *(DumpableObject **) p2; + DumpableObject *obj1 = *(DumpableObject * const *) p1; + DumpableObject *obj2 = *(DumpableObject * const *) p2; int cmpval; /* Sort by type */ @@ -170,8 +170,8 @@ DOTypeNameCompare(const void *p1, const void *p2) /* To have a stable sort order, break ties for some object types */ if (obj1->objType == DO_FUNC || obj1->objType == DO_AGG) { - FuncInfo *fobj1 = *(FuncInfo **) p1; - FuncInfo *fobj2 = *(FuncInfo **) p2; + FuncInfo *fobj1 = *(FuncInfo * const *) p1; + FuncInfo *fobj2 = *(FuncInfo * const *) p2; cmpval = fobj1->nargs - fobj2->nargs; if (cmpval != 0) @@ -200,8 +200,8 @@ sortDumpableObjectsByTypeOid(DumpableObject **objs, int numObjs) static int DOTypeOidCompare(const void *p1, const void *p2) { - DumpableObject *obj1 = *(DumpableObject **) p1; - DumpableObject *obj2 = *(DumpableObject **) p2; + DumpableObject *obj1 = *(DumpableObject * const *) p1; + DumpableObject *obj2 = *(DumpableObject * const *) p2; int cmpval; cmpval = oldObjectTypePriority[obj1->objType] - |