From 56c754a555d82c4c9f7543495ff89ed3101b8100 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 27 Jul 2000 19:49:24 +0000 Subject: [PATCH] Some pedantic compile syntax errors to fix with the following patch for today's snapshot Andreas --- src/backend/utils/misc/guc-file.l | 4 ++-- src/bin/pg_dump/pg_backup.h | 6 ++++-- src/bin/pg_dump/pg_backup_archiver.c | 2 +- src/include/utils/guc.h | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index c056af9ace..10e179f773 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -4,7 +4,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.3 2000/06/04 01:44:34 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.4 2000/07/27 19:49:18 momjian Exp $ */ %{ @@ -33,7 +33,7 @@ enum { GUC_REAL = 4, GUC_EQUALS = 5, GUC_EOL = 99, - GUC_ERROR = 100, + GUC_ERROR = 100 }; #if defined(yywrap) diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index fb930637cc..6e37a7c01d 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -115,8 +115,10 @@ extern void ArchiveEntry(Archive* AH, const char* oid, const char* name, /* Called to write *data* to the archive */ extern int WriteData(Archive* AH, const void* data, int dLen); -//extern int StartBlobs(Archive* AH); -//extern int EndBlobs(Archive* AH); +/* +extern int StartBlobs(Archive* AH); +extern int EndBlobs(Archive* AH); +*/ extern int StartBlob(Archive* AH, int oid); extern int EndBlob(Archive* AH, int oid); diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 55fb0f742f..071a066912 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -1357,7 +1357,7 @@ static void _reconnectAsOwner(ArchiveHandle* AH, TocEntry* te) if (RestoringToDB(AH)) { ReconnectDatabase(AH, te->owner); - //todo pjw - ???? fix for db connection... + /* todo pjw - ???? fix for db connection... */ } else { diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 67f830d6c4..0d8661442f 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -4,7 +4,7 @@ * External declarations pertaining to backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * - * $Header: /cvsroot/pgsql/src/include/utils/guc.h,v 1.3 2000/07/03 20:46:10 petere Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/guc.h,v 1.4 2000/07/27 19:49:24 momjian Exp $ */ #ifndef GUC_H #define GUC_H @@ -43,7 +43,7 @@ typedef enum { PGC_SIGHUP, PGC_BACKEND, PGC_SUSET, - PGC_USERSET, + PGC_USERSET } GucContext;