Fix some translator comments so that xgettext finds them and pgindent does

petere · petere · commit a75ccd1def73 · 2006-11-28T12:54:42.000Z
not destroy them.  Maybe we can adjust pgindent sometime.
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.158 2006/10/04 00:29:55 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.159 2006/11/28 12:54:41 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1229,10 +1229,8 @@ findTargetlistEntry(ParseState *pstate, Node *node, List **tlist, int clause)
 							ereport(ERROR,
 									(errcode(ERRCODE_AMBIGUOUS_COLUMN),
 
-							/*
-							 * translator: first %s is name of a SQL
-							 * construct, eg ORDER BY
-							 */
+							/*------
+							  translator: first %s is name of a SQL construct, eg ORDER BY */
 									 errmsg("%s \"%s\" is ambiguous",
 											clauseText[clause], name),
 									 parser_errposition(pstate, location)));
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.145 2006/10/11 20:21:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.146 2006/11/28 12:54:41 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -954,9 +954,8 @@ select_common_type(List *typeids, const char *context)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
 
-				/*
-				 * translator: first %s is name of a SQL construct, eg CASE
-				 */
+				/*------
+				  translator: first %s is name of a SQL construct, eg CASE */
 						 errmsg("%s types %s and %s cannot be matched",
 								context,
 								format_type_be(ptype),
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.503 2006/11/21 20:59:52 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.504 2006/11/28 12:54:41 petere Exp $
  *
  * NOTES
  *
@@ -2390,28 +2390,25 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
 	if (WIFEXITED(exitstatus))
 		ereport(lev,
 
-		/*
-		 * translator: %s is a noun phrase describing a child process, such as
-		 * "server process"
-		 */
+		/*------
+		  translator: %s is a noun phrase describing a child process, such as
+		  "server process" */
 				(errmsg("%s (PID %d) exited with exit code %d",
 						procname, pid, WEXITSTATUS(exitstatus))));
 	else if (WIFSIGNALED(exitstatus))
 		ereport(lev,
 
-		/*
-		 * translator: %s is a noun phrase describing a child process, such as
-		 * "server process"
-		 */
+		/*------
+		  translator: %s is a noun phrase describing a child process, such as
+		  "server process" */
 				(errmsg("%s (PID %d) was terminated by signal %d",
 						procname, pid, WTERMSIG(exitstatus))));
 	else
 		ereport(lev,
 
-		/*
-		 * translator: %s is a noun phrase describing a child process, such as
-		 * "server process"
-		 */
+		/*------
+		  translator: %s is a noun phrase describing a child process, such as
+		  "server process" */
 				(errmsg("%s (PID %d) exited with unexpected status %d",
 						procname, pid, exitstatus)));
 }
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.177 2006/11/21 22:19:46 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178 2006/11/28 12:54:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1957,11 +1957,10 @@ useful_strerror(int errnum)
 	 */
 	if (str == NULL || *str == '\0')
 	{
-		/*
-		 * translator: This string will be truncated at 47 characters
-		 * expanded.
-		 */
 		snprintf(errorstr_buf, sizeof(errorstr_buf),
+				 /*------
+				   translator: This string will be truncated at 47
+				   characters expanded. */
 				 _("operating system error %d"), errnum);
 		str = errorstr_buf;
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.145 2006/10/11 20:21:03 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.146 2006/11/28 12:54:41 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -954,9 +954,8 @@ select_common_type(List typeids, const char context)`
`954`	`954`	`ereport(ERROR,`
`955`	`955`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`956`	`956`
`957`		`- /*`
`958`		`- * translator: first %s is name of a SQL construct, eg CASE`
`959`		`- */`
	`957`	`+ /*------`
	`958`	`+ translator: first %s is name of a SQL construct, eg CASE */`
`960`	`959`	`errmsg("%s types %s and %s cannot be matched",`
`961`	`960`	`context,`
`962`	`961`	`format_type_be(ptype),`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*`
`43`	`43`	`*`
`44`	`44`	`* IDENTIFICATION`
`45`		`- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.177 2006/11/21 22:19:46 tgl Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178 2006/11/28 12:54:42 petere Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -1957,11 +1957,10 @@ useful_strerror(int errnum)`
`1957`	`1957`	`*/`
`1958`	`1958`	`if (str == NULL \|\| *str == '\0')`
`1959`	`1959`	`{`
`1960`		`- /*`
`1961`		`- * translator: This string will be truncated at 47 characters`
`1962`		`- * expanded.`
`1963`		`- */`
`1964`	`1960`	`snprintf(errorstr_buf, sizeof(errorstr_buf),`
	`1961`	`+ /*------`
	`1962`	`+ translator: This string will be truncated at 47`
	`1963`	`+ characters expanded. */`
`1965`	`1964`	`_("operating system error %d"), errnum);`
`1966`	`1965`	`str = errorstr_buf;`
`1967`	`1966`	`}`