Fix up error messages.

Thomas G. Lockhart · Thomas G. Lockhart · commit c1d3c04d383f · 1997-09-13T03:11:51.000Z
diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.26 1997/09/12 04:07:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.27 1997/09/13 03:11:51 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -804,7 +804,7 @@ varattno(Relation rd, char *a)
 		}
 	}
 
-	elog(WARN, "Relation %s does not have attribute %s\n",
+	elog(WARN, "Relation %s does not have attribute %s",
 		 RelationGetRelationName(rd), a);
 	return (-1);
 }
@@ -872,7 +872,7 @@ getAttrName(Relation rd, int attrno)
 				return (name);
 			}
 		}
-		elog(WARN, "Illegal attr no %d for relation %s\n",
+		elog(WARN, "Illegal attr no %d for relation %s",
 			 attrno, RelationGetRelationName(rd));
 	}
 	else if (attrno >= 1 && attrno <= RelationGetNumberOfAttributes(rd))
@@ -882,7 +882,7 @@ getAttrName(Relation rd, int attrno)
 	}
 	else
 	{
-		elog(WARN, "Illegal attr no %d for relation %s\n",
+		elog(WARN, "Illegal attr no %d for relation %s",
 			 attrno, RelationGetRelationName(rd));
 	}
 
@@ -945,7 +945,7 @@ GetArrayElementType(Oid typearray)
 									 0, 0, 0);
 
 	if (!HeapTupleIsValid(type_tuple))
-		elog(WARN, "GetArrayElementType: Cache lookup failed for type %d\n",
+		elog(WARN, "GetArrayElementType: Cache lookup failed for type %d",
 			 typearray);
 
 	/* get the array type struct from the type tuple */
@@ -1518,9 +1518,7 @@ typeid_get_retinfunc(Oid type_id)
 									ObjectIdGetDatum(type_id),
 									0, 0, 0);
 	if (!HeapTupleIsValid(typeTuple))
-		elog(WARN,
-			 "typeid_get_retinfunc: Invalid type - oid = %u",
-			 type_id);
+		elog(WARN, "typeid_get_retinfunc: Invalid type - oid = %u", type_id);
 
 	type = (TypeTupleForm) GETSTRUCT(typeTuple);
 	infunc = type->typinput;
@@ -1539,9 +1537,7 @@ typeid_get_retoutfunc(Oid type_id)
 									ObjectIdGetDatum(type_id),
 									0, 0, 0);
 	if (!HeapTupleIsValid(typeTuple))
-		elog(WARN,
-			 "typeid_get_retoutfunc: Invalid type - oid = %u",
-			 type_id);
+		elog(WARN, "typeid_get_retoutfunc: Invalid type - oid = %u", type_id);
 
 	type = (TypeTupleForm) GETSTRUCT(typeTuple);
 	outfunc = type->typoutput;
@@ -1559,7 +1555,7 @@ typeid_get_relid(Oid type_id)
 									ObjectIdGetDatum(type_id),
 									0, 0, 0);
 	if (!HeapTupleIsValid(typeTuple))
-		elog(WARN, "typeid_get_relid: Invalid type - oid = %u ", type_id);
+		elog(WARN, "typeid_get_relid: Invalid type - oid = %u", type_id);
 
 	type = (TypeTupleForm) GETSTRUCT(typeTuple);
 	infunc = type->typrelid;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.26 1997/09/12 04:07:56 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.27 1997/09/13 03:11:51 thomas Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -804,7 +804,7 @@ varattno(Relation rd, char *a)`
`804`	`804`	`}`
`805`	`805`	`}`
`806`	`806`
`807`		`- elog(WARN, "Relation %s does not have attribute %s\n",`
	`807`	`+ elog(WARN, "Relation %s does not have attribute %s",`
`808`	`808`	`RelationGetRelationName(rd), a);`
`809`	`809`	`return (-1);`
`810`	`810`	`}`
`@@ -872,7 +872,7 @@ getAttrName(Relation rd, int attrno)`
`872`	`872`	`return (name);`
`873`	`873`	`}`
`874`	`874`	`}`
`875`		`- elog(WARN, "Illegal attr no %d for relation %s\n",`
	`875`	`+ elog(WARN, "Illegal attr no %d for relation %s",`
`876`	`876`	`attrno, RelationGetRelationName(rd));`
`877`	`877`	`}`
`878`	`878`	`else if (attrno >= 1 && attrno <= RelationGetNumberOfAttributes(rd))`
`@@ -882,7 +882,7 @@ getAttrName(Relation rd, int attrno)`
`882`	`882`	`}`
`883`	`883`	`else`
`884`	`884`	`{`
`885`		`- elog(WARN, "Illegal attr no %d for relation %s\n",`
	`885`	`+ elog(WARN, "Illegal attr no %d for relation %s",`
`886`	`886`	`attrno, RelationGetRelationName(rd));`
`887`	`887`	`}`
`888`	`888`
`@@ -945,7 +945,7 @@ GetArrayElementType(Oid typearray)`
`945`	`945`	`0, 0, 0);`
`946`	`946`
`947`	`947`	`if (!HeapTupleIsValid(type_tuple))`
`948`		`- elog(WARN, "GetArrayElementType: Cache lookup failed for type %d\n",`
	`948`	`+ elog(WARN, "GetArrayElementType: Cache lookup failed for type %d",`
`949`	`949`	`typearray);`
`950`	`950`
`951`	`951`	`/* get the array type struct from the type tuple */`
`@@ -1518,9 +1518,7 @@ typeid_get_retinfunc(Oid type_id)`
`1518`	`1518`	`ObjectIdGetDatum(type_id),`
`1519`	`1519`	`0, 0, 0);`
`1520`	`1520`	`if (!HeapTupleIsValid(typeTuple))`
`1521`		`- elog(WARN,`
`1522`		`- "typeid_get_retinfunc: Invalid type - oid = %u",`
`1523`		`- type_id);`
	`1521`	`+ elog(WARN, "typeid_get_retinfunc: Invalid type - oid = %u", type_id);`
`1524`	`1522`
`1525`	`1523`	`type = (TypeTupleForm) GETSTRUCT(typeTuple);`
`1526`	`1524`	`infunc = type->typinput;`
`@@ -1539,9 +1537,7 @@ typeid_get_retoutfunc(Oid type_id)`
`1539`	`1537`	`ObjectIdGetDatum(type_id),`
`1540`	`1538`	`0, 0, 0);`
`1541`	`1539`	`if (!HeapTupleIsValid(typeTuple))`
`1542`		`- elog(WARN,`
`1543`		`- "typeid_get_retoutfunc: Invalid type - oid = %u",`
`1544`		`- type_id);`
	`1540`	`+ elog(WARN, "typeid_get_retoutfunc: Invalid type - oid = %u", type_id);`
`1545`	`1541`
`1546`	`1542`	`type = (TypeTupleForm) GETSTRUCT(typeTuple);`
`1547`	`1543`	`outfunc = type->typoutput;`
`@@ -1559,7 +1555,7 @@ typeid_get_relid(Oid type_id)`
`1559`	`1555`	`ObjectIdGetDatum(type_id),`
`1560`	`1556`	`0, 0, 0);`
`1561`	`1557`	`if (!HeapTupleIsValid(typeTuple))`
`1562`		`- elog(WARN, "typeid_get_relid: Invalid type - oid = %u ", type_id);`
	`1558`	`+ elog(WARN, "typeid_get_relid: Invalid type - oid = %u", type_id);`
`1563`	`1559`
`1564`	`1560`	`type = (TypeTupleForm) GETSTRUCT(typeTuple);`
`1565`	`1561`	`infunc = type->typrelid;`