Correct ancient logic mistake in assertion

petere · petere · commit e6d800981ed0 · 2011-09-06T23:05:02.000+03:00
Found by gcc -Wlogical-op
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -817,7 +817,7 @@ InsertOneValue(char *value, int i)
 	Oid			typoutput;
 	char	   *prt;
 
-	AssertArg(i >= 0 || i < MAXATTR);
+	AssertArg(i >= 0 && i < MAXATTR);
 
 	elog(DEBUG4, "inserting column %d value \"%s\"", i, value);
 
@@ -842,7 +842,7 @@ void
 InsertOneNull(int i)
 {
 	elog(DEBUG4, "inserting column %d NULL", i);
-	Assert(i >= 0 || i < MAXATTR);
+	Assert(i >= 0 && i < MAXATTR);
 	values[i] = PointerGetDatum(NULL);
 	Nulls[i] = true;
 }

Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ InsertOneValue(char *value, int i)`
`817`	`817`	`Oid typoutput;`
`818`	`818`	`char *prt;`
`819`	`819`
`820`		`- AssertArg(i >= 0 \|\| i < MAXATTR);`
	`820`	`+ AssertArg(i >= 0 && i < MAXATTR);`
`821`	`821`
`822`	`822`	`elog(DEBUG4, "inserting column %d value \"%s\"", i, value);`
`823`	`823`
`@@ -842,7 +842,7 @@ void`
`842`	`842`	`InsertOneNull(int i)`
`843`	`843`	`{`
`844`	`844`	`elog(DEBUG4, "inserting column %d NULL", i);`
`845`		`- Assert(i >= 0 \|\| i < MAXATTR);`
	`845`	`+ Assert(i >= 0 && i < MAXATTR);`
`846`	`846`	`values[i] = PointerGetDatum(NULL);`
`847`	`847`	`Nulls[i] = true;`
`848`	`848`	`}`