Don't use the result of strcmp as if it were a boolean.

tglsfdc · tglsfdc · commit b9e9775e0c72 · 2009-04-23T17:39:21.000Z
A service of your local coding style police.
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.221 2009/04/15 21:36:12 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.222 2009/04/23 17:39:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -387,12 +387,12 @@ createdb(const CreatedbStmt *stmt)
 	 */
 	if (strcmp(dbtemplate, "template0") != 0)
 	{
-		if (strcmp(dbcollate, src_collate))
+		if (strcmp(dbcollate, src_collate) != 0)
 			ereport(ERROR,
 					(errmsg("new collation is incompatible with the collation of the template database (%s)", src_collate),
 					 errhint("Use the same collation as in the template database, or use template0 as template.")));
 
-		if (strcmp(dbctype, src_ctype))
+		if (strcmp(dbctype, src_ctype) != 0)
 			ereport(ERROR,
 					(errmsg("new LC_CTYPE is incompatible with LC_CTYPE of the template database (%s)", src_ctype),
 					 errhint("Use the same LC_CTYPE as in the template database, or use template0 as template.")));

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.221 2009/04/15 21:36:12 alvherre Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.222 2009/04/23 17:39:21 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -387,12 +387,12 @@ createdb(const CreatedbStmt *stmt)`
`387`	`387`	`*/`
`388`	`388`	`if (strcmp(dbtemplate, "template0") != 0)`
`389`	`389`	`{`
`390`		`- if (strcmp(dbcollate, src_collate))`
	`390`	`+ if (strcmp(dbcollate, src_collate) != 0)`
`391`	`391`	`ereport(ERROR,`
`392`	`392`	`(errmsg("new collation is incompatible with the collation of the template database (%s)", src_collate),`
`393`	`393`	`errhint("Use the same collation as in the template database, or use template0 as template.")));`
`394`	`394`
`395`		`- if (strcmp(dbctype, src_ctype))`
	`395`	`+ if (strcmp(dbctype, src_ctype) != 0)`
`396`	`396`	`ereport(ERROR,`
`397`	`397`	`(errmsg("new LC_CTYPE is incompatible with LC_CTYPE of the template database (%s)", src_ctype),`
`398`	`398`	`errhint("Use the same LC_CTYPE as in the template database, or use template0 as template.")));`