Message styling

Author: petere

src/bin/pg_dump/pg_backup_archiver.c

@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.98 2004/10/08 15:03:26 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.99 2004/10/22 16:04:35 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -395,7 +395,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 
 		if ((reqs & REQ_SCHEMA) != 0)	/* We want the schema */
 		{
-			ahlog(AH, 1, "setting owner and acl for %s %s\n",
+			ahlog(AH, 1, "setting owner and privileges for %s %s\n",
 				  te->desc, te->tag);
 			_printTocEntry(AH, te, ropt, false, true);
 		}
@@ -1269,7 +1269,7 @@ warn_or_die_horribly(ArchiveHandle *AH,
 	}
 	if (AH->currentTE != NULL && AH->currentTE != AH->lastErrorTE)
 	{
-		write_msg(modulename, "Error from TOC Entry %d; %u %u %s %s %s\n", AH->currentTE->dumpId,
+		write_msg(modulename, "Error from TOC entry %d; %u %u %s %s %s\n", AH->currentTE->dumpId,
 		 AH->currentTE->catalogId.tableoid, AH->currentTE->catalogId.oid,
 		  AH->currentTE->desc, AH->currentTE->tag, AH->currentTE->owner);
 	}

src/bin/pg_dump/pg_dump.c

@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.389 2004/10/18 00:20:41 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.390 2004/10/22 16:04:35 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -6930,7 +6930,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 
 		if (indxinfo == NULL)
 		{
-			write_msg(NULL, "missing index for constraint %s\n",
+			write_msg(NULL, "missing index for constraint \"%s\"\n",
 					  coninfo->dobj.name);
 			exit_nicely();
 		}
@@ -7100,7 +7100,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 	}
 	else
 	{
-		write_msg(NULL, "unexpected constraint type\n");
+		write_msg(NULL, "unrecognized constraint type: %c\n", coninfo->contype);
 		exit_nicely();
 	}
 
@@ -7699,7 +7699,7 @@ getDependencies(void)
 		return;
 
 	if (g_verbose)
-		write_msg(NULL, "fetching dependency data\n");
+		write_msg(NULL, "reading dependency data\n");
 
 	/* Make sure we are in proper schema */
 	selectSourceSchema("pg_catalog");

src/bin/pg_dump/pg_restore.c

@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.64 2004/10/13 14:24:16 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.65 2004/10/22 16:04:35 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -372,7 +372,7 @@ usage(const char *progname)
 	printf(_("\nOptions controlling the restore:\n"));
 	printf(_("  -a, --data-only          restore only the data, no schema\n"));
 	printf(_("  -c, --clean              clean (drop) schema prior to create\n"));
-	printf(_("  -C, --create             process commands to create the database\n"));
+	printf(_("  -C, --create             issue commands to create the database\n"));
 	printf(_("  -I, --index=NAME         restore named index\n"));
 	printf(_("  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 			 "                           output from this file\n"));