Cleanup various comparisons with the constant "true".

robertmhaas · robertmhaas · commit 5aa446c961a6 · 2010-11-14T21:03:48.000-05:00
Itagaki Takahiro, with slight modifications.
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
@@ -254,7 +254,7 @@ copy_clog_xlog_xid(void)
 
 	snprintf(old_clog_path, sizeof(old_clog_path), "%s/pg_clog", old_cluster.pgdata);
 	snprintf(new_clog_path, sizeof(new_clog_path), "%s/pg_clog", new_cluster.pgdata);
-	if (rmtree(new_clog_path, true) != true)
+	if (!rmtree(new_clog_path, true))
 		pg_log(PG_FATAL, "Unable to delete directory %s\n", new_clog_path);
 	check_ok();
 
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
@@ -1361,7 +1361,7 @@ scanGetItem(IndexScanDesc scan, ItemPointer advancePast,
 }
 
 #define GinIsNewKey(s)		( ((GinScanOpaque) scan->opaque)->keys == NULL )
-#define GinIsVoidRes(s)		( ((GinScanOpaque) scan->opaque)->isVoidRes == true )
+#define GinIsVoidRes(s)		( ((GinScanOpaque) scan->opaque)->isVoidRes )
 
 Datum
 gingetbitmap(PG_FUNCTION_ARGS)
diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
@@ -380,12 +380,12 @@ gist_box_picksplit(PG_FUNCTION_ARGS)
 	for (i = OffsetNumberNext(FirstOffsetNumber); i <= maxoff; i = OffsetNumberNext(i))
 	{
 		cur = DatumGetBoxP(entryvec->vector[i].key);
-		if (allisequal == true && (
-								   pageunion.high.x != cur->high.x ||
-								   pageunion.high.y != cur->high.y ||
-								   pageunion.low.x != cur->low.x ||
-								   pageunion.low.y != cur->low.y
-								   ))
+		if (allisequal && (
+						   pageunion.high.x != cur->high.x ||
+						   pageunion.high.y != cur->high.y ||
+						   pageunion.low.x != cur->low.x ||
+						   pageunion.low.y != cur->low.y
+						   ))
 			allisequal = false;
 
 		adjustBox(&pageunion, cur);
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
@@ -1104,7 +1104,7 @@ init_params(List *options, bool isInit,
 	if (is_cycled != NULL)
 	{
 		new->is_cycled = intVal(is_cycled->arg);
-		Assert(new->is_cycled == false || new->is_cycled == true);
+		Assert(BoolIsValid(new->is_cycled));
 	}
 	else if (isInit)
 		new->is_cycled = false;
diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c
@@ -244,11 +244,11 @@ RS_execute(Regis *r, char *str)
 		switch (ptr->type)
 		{
 			case RSF_ONEOF:
-				if (mb_strchr((char *) ptr->data, c) != true)
+				if (!mb_strchr((char *) ptr->data, c))
 					return false;
 				break;
 			case RSF_NONEOF:
-				if (mb_strchr((char *) ptr->data, c) == true)
+				if (mb_strchr((char *) ptr->data, c))
 					return false;
 				break;
 			default:
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
@@ -3903,7 +3903,7 @@ lseg_inside_poly(Point *a, Point *b, POLYGON *poly, int start)
 	t.p[1] = *b;
 	s.p[0] = poly->p[(start == 0) ? (poly->npts - 1) : (start - 1)];
 
-	for (i = start; i < poly->npts && res == true; i++)
+	for (i = start; i < poly->npts && res; i++)
 	{
 		Point	   *interpt;
 
@@ -3979,7 +3979,7 @@ poly_contain(PG_FUNCTION_ARGS)
 		s.p[0] = polyb->p[polyb->npts - 1];
 		result = true;
 
-		for (i = 0; i < polyb->npts && result == true; i++)
+		for (i = 0; i < polyb->npts && result; i++)
 		{
 			s.p[1] = polyb->p[i];
 			result = lseg_inside_poly(s.p, s.p + 1, polya, 0);
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
@@ -109,7 +109,7 @@ find_wordentry(TSVector t, TSQuery q, QueryOperand *item, int32 *nitem)
 			StopHigh = StopMiddle;
 	}
 
-	if (item->prefix == true)
+	if (item->prefix)
 	{
 		if (StopLow >= StopHigh)
 			StopMiddle = StopHigh;
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
@@ -625,7 +625,7 @@ checkcondition_str(void *checkval, QueryOperand *val)
 			StopHigh = StopMiddle;
 	}
 
-	if (res == false && val->prefix == true)
+	if (!res && val->prefix)
 	{
 		/*
 		 * there was a failed exact search, so we should scan further to find
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -808,7 +808,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
 					unsigned int nbspace;
 
 					if (opt_border != 0 ||
-						(format->wrap_right_border == false && i > 0))
+						(!format->wrap_right_border && i > 0))
 						fputs(curr_nl_line ? format->header_nl_left : " ",
 							  fout);
 
@@ -829,7 +829,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
 					else
 						fprintf(fout, "%*s", width_wrap[i], "");
 
-					if (opt_border != 0 || format->wrap_right_border == true)
+					if (opt_border != 0 || format->wrap_right_border)
 						fputs(!header_done[i] ? format->header_nl_right : " ",
 							  fout);
 
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
@@ -165,7 +165,7 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 
 	ecpg_log("ECPGsetcommit on line %d: action \"%s\"; connection \"%s\"\n", lineno, mode, con->name);
 
-	if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)
+	if (con->autocommit && strncmp(mode, "off", strlen("off")) == 0)
 	{
 		if (PQtransactionStatus(con->connection) == PQTRANS_IDLE)
 		{
@@ -176,7 +176,7 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 		}
 		con->autocommit = false;
 	}
-	else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)
+	else if (!con->autocommit && strncmp(mode, "on", strlen("on")) == 0)
 	{
 		if (PQtransactionStatus(con->connection) != PQTRANS_IDLE)
 		{
diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons
@@ -353,7 +353,7 @@ ECPG: ClosePortalStmtCLOSEcursor_name block
 	}
 ECPG: opt_hold block
 	{
-		if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit == true)
+		if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit)
 			$$ = make_str("with hold");
 		else
 			$$ = EMPTY;

Original file line number	Diff line number	Diff line change
`@@ -1361,7 +1361,7 @@ scanGetItem(IndexScanDesc scan, ItemPointer advancePast,`
`1361`	`1361`	`}`
`1362`	`1362`
`1363`	`1363`	`#define GinIsNewKey(s) ( ((GinScanOpaque) scan->opaque)->keys == NULL )`
`1364`		`-#define GinIsVoidRes(s) ( ((GinScanOpaque) scan->opaque)->isVoidRes == true )`
	`1364`	`+#define GinIsVoidRes(s) ( ((GinScanOpaque) scan->opaque)->isVoidRes )`
`1365`	`1365`
`1366`	`1366`	`Datum`
`1367`	`1367`	`gingetbitmap(PG_FUNCTION_ARGS)`
Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,7 @@ init_params(List *options, bool isInit,`
`1104`	`1104`	`if (is_cycled != NULL)`
`1105`	`1105`	`{`
`1106`	`1106`	`new->is_cycled = intVal(is_cycled->arg);`
`1107`		`- Assert(new->is_cycled == false \|\| new->is_cycled == true);`
	`1107`	`+ Assert(BoolIsValid(new->is_cycled));`
`1108`	`1108`	`}`
`1109`	`1109`	`else if (isInit)`
`1110`	`1110`	`new->is_cycled = false;`
Original file line number	Diff line number	Diff line change
`@@ -3903,7 +3903,7 @@ lseg_inside_poly(Point a, Point b, POLYGON *poly, int start)`
`3903`	`3903`	`t.p[1] = *b;`
`3904`	`3904`	`s.p[0] = poly->p[(start == 0) ? (poly->npts - 1) : (start - 1)];`
`3905`	`3905`
`3906`		`- for (i = start; i < poly->npts && res == true; i++)`
	`3906`	`+ for (i = start; i < poly->npts && res; i++)`
`3907`	`3907`	`{`
`3908`	`3908`	`Point *interpt;`
`3909`	`3909`
`@@ -3979,7 +3979,7 @@ poly_contain(PG_FUNCTION_ARGS)`
`3979`	`3979`	`s.p[0] = polyb->p[polyb->npts - 1];`
`3980`	`3980`	`result = true;`
`3981`	`3981`
`3982`		`- for (i = 0; i < polyb->npts && result == true; i++)`
	`3982`	`+ for (i = 0; i < polyb->npts && result; i++)`
`3983`	`3983`	`{`
`3984`	`3984`	`s.p[1] = polyb->p[i];`
`3985`	`3985`	`result = lseg_inside_poly(s.p, s.p + 1, polya, 0);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ find_wordentry(TSVector t, TSQuery q, QueryOperand item, int32 nitem)`
`109`	`109`	`StopHigh = StopMiddle;`
`110`	`110`	`}`
`111`	`111`
`112`		`- if (item->prefix == true)`
	`112`	`+ if (item->prefix)`
`113`	`113`	`{`
`114`	`114`	`if (StopLow >= StopHigh)`
`115`	`115`	`StopMiddle = StopHigh;`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ checkcondition_str(void checkval, QueryOperand val)`
`625`	`625`	`StopHigh = StopMiddle;`
`626`	`626`	`}`
`627`	`627`
`628`		`- if (res == false && val->prefix == true)`
	`628`	`+ if (!res && val->prefix)`
`629`	`629`	`{`
`630`	`630`	`/*`
`631`	`631`	`* there was a failed exact search, so we should scan further to find`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ ECPGsetcommit(int lineno, const char mode, const char connection_name)`
`165`	`165`
`166`	`166`	`ecpg_log("ECPGsetcommit on line %d: action \"%s\"; connection \"%s\"\n", lineno, mode, con->name);`
`167`	`167`
`168`		`- if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)`
	`168`	`+ if (con->autocommit && strncmp(mode, "off", strlen("off")) == 0)`
`169`	`169`	`{`
`170`	`170`	`if (PQtransactionStatus(con->connection) == PQTRANS_IDLE)`
`171`	`171`	`{`
`@@ -176,7 +176,7 @@ ECPGsetcommit(int lineno, const char mode, const char connection_name)`
`176`	`176`	`}`
`177`	`177`	`con->autocommit = false;`
`178`	`178`	`}`
`179`		`- else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)`
	`179`	`+ else if (!con->autocommit && strncmp(mode, "on", strlen("on")) == 0)`
`180`	`180`	`{`
`181`	`181`	`if (PQtransactionStatus(con->connection) != PQTRANS_IDLE)`
`182`	`182`	`{`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ ECPG: ClosePortalStmtCLOSEcursor_name block`
`353`	`353`	`}`
`354`	`354`	`ECPG: opt_hold block`
`355`	`355`	`{`
`356`		`- if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit == true)`
	`356`	`+ if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit)`
`357`	`357`	`$$ = make_str("with hold");`
`358`	`358`	`else`
`359`	`359`	`$$ = EMPTY;`