1515 *
1616 *
1717 * IDENTIFICATION
18- *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.32 2001/08/22 20:23:23 petere Exp $
18+ *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.33 2001/09/21 21:58:30 petere Exp $
1919 *
2020 * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2121 *
@@ -333,7 +333,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
333333 * warnings.
334334 */
335335if (!AH -> CustomOutPtr )
336- write_msg (modulename ,"WARNING: skippingBLOB restoration\n" );
336+ write_msg (modulename ,"WARNING: skippinglarge object restoration\n" );
337337
338338}
339339else
@@ -398,12 +398,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
398398
399399if ((reqs & 2 )!= 0 )/* We loaded the data */
400400{
401- ahlog (AH ,1 ,"fixing upBLOB reference for %s\n" ,te -> name );
401+ ahlog (AH ,1 ,"fixing uplarge object cross- reference for %s\n" ,te -> name );
402402FixupBlobRefs (AH ,te -> name );
403403}
404404}
405405else
406- ahlog (AH ,2 ,"ignoringBLOB cross-references for %s %s\n" ,te -> desc ,te -> name );
406+ ahlog (AH ,2 ,"ignoringlarge object cross-references for %s %s\n" ,te -> desc ,te -> name );
407407
408408te = te -> next ;
409409}
@@ -717,7 +717,7 @@ StartBlob(Archive *AHX, Oid oid)
717717ArchiveHandle * AH = (ArchiveHandle * )AHX ;
718718
719719if (!AH -> StartBlobPtr )
720- die_horribly (AH ,modulename ,"BLOB output not supported in chosen format\n" );
720+ die_horribly (AH ,modulename ,"large object output not supported in chosen format\n" );
721721
722722(* AH -> StartBlobPtr ) (AH ,AH -> currToc ,oid );
723723
@@ -757,14 +757,14 @@ EndRestoreBlobs(ArchiveHandle *AH)
757757{
758758if (AH -> txActive )
759759{
760- ahlog (AH ,2 ,"committingBLOB transactions\n" );
760+ ahlog (AH ,2 ,"committinglarge object transactions\n" );
761761CommitTransaction (AH );
762762}
763763
764764if (AH -> blobTxActive )
765765CommitTransactionXref (AH );
766766
767- ahlog (AH ,1 ,"restored %dBLOBs \n" ,AH -> blobCount );
767+ ahlog (AH ,1 ,"restored %dlarge objects \n" ,AH -> blobCount );
768768}
769769
770770
@@ -781,7 +781,7 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
781781if (!AH -> createdBlobXref )
782782{
783783if (!AH -> connection )
784- die_horribly (AH ,modulename ,"cannot restoreBLOBs without a database connection\n" );
784+ die_horribly (AH ,modulename ,"cannot restorelarge objects without a database connection\n" );
785785
786786CreateBlobXrefTable (AH );
787787AH -> createdBlobXref = 1 ;
@@ -792,23 +792,23 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
792792 */
793793if (!AH -> txActive )
794794{
795- ahlog (AH ,2 ,"startingBLOB transactions\n" );
795+ ahlog (AH ,2 ,"startinglarge object transactions\n" );
796796StartTransaction (AH );
797797}
798798if (!AH -> blobTxActive )
799799StartTransactionXref (AH );
800800
801801loOid = lo_creat (AH -> connection ,INV_READ |INV_WRITE );
802802if (loOid == 0 )
803- die_horribly (AH ,modulename ,"could not createBLOB \n" );
803+ die_horribly (AH ,modulename ,"could not createlarge object \n" );
804804
805- ahlog (AH ,2 ,"restoringBLOB oid %u as %u\n" ,oid ,loOid );
805+ ahlog (AH ,2 ,"restoringlarge object with oid %u as %u\n" ,oid ,loOid );
806806
807807InsertBlobXref (AH ,oid ,loOid );
808808
809809AH -> loFd = lo_open (AH -> connection ,loOid ,INV_WRITE );
810810if (AH -> loFd == -1 )
811- die_horribly (AH ,modulename ,"could not openBLOB \n" );
811+ die_horribly (AH ,modulename ,"could not openlarge object \n" );
812812
813813AH -> writingBlob = 1 ;
814814}
@@ -824,7 +824,7 @@ EndRestoreBlob(ArchiveHandle *AH, Oid oid)
824824 */
825825if (((AH -> blobCount /BLOB_BATCH_SIZE )* BLOB_BATCH_SIZE )== AH -> blobCount )
826826{
827- ahlog (AH ,2 ,"committingBLOB transactions\n" );
827+ ahlog (AH ,2 ,"committinglarge object transactions\n" );
828828CommitTransaction (AH );
829829CommitTransactionXref (AH );
830830}
@@ -1198,7 +1198,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
11981198if (AH -> writingBlob )
11991199{
12001200res = lo_write (AH -> connection ,AH -> loFd , (void * )ptr ,size * nmemb );
1201- ahlog (AH ,5 ,"wrote %d bytes ofBLOB data (result = %d)\n" ,size * nmemb ,res );
1201+ ahlog (AH ,5 ,"wrote %d bytes oflarge object data (result = %d)\n" ,size * nmemb ,res );
12021202if (res < size * nmemb )
12031203die_horribly (AH ,modulename ,"could not write to large object (result: %d, expected: %d)\n" ,
12041204res ,size * nmemb );