Don't use !! but != 0/NULL to force boolean evaluation.

anarazel · anarazel · commit 1a7a43672bf2 · 2016-03-27T18:10:19.000+02:00
I introduced several uses of !! to force bit arithmetic to be boolean,
but per discussion the project prefers != 0/NULL.

Discussion: CA+TgmoZP5KakLGP6B4vUjgMBUW0woq_dJYi0paOz-My0Hwt_vQ@mail.gmail.com
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
@@ -407,7 +407,7 @@ sepgsql_avc_check_perms_label(const char *tcontext,
 		audit_name != SEPGSQL_AVC_NOAUDIT &&
 		sepgsql_get_mode() != SEPGSQL_MODE_INTERNAL)
 	{
-		sepgsql_audit_log(!!denied,
+		sepgsql_audit_log(denied != 0,
 						  cache->scontext,
 						  cache->tcontext_is_valid ?
 						  cache->tcontext : sepgsql_avc_unlabeled(),
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5335,7 +5335,8 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		LWLockRelease(XidGenLock);
 	}
 
-	Assert(!!(parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == (origin_id != InvalidRepOriginId));
+	Assert(((parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == 0) ==
+		   (origin_id == InvalidRepOriginId));
 
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 		commit_time = parsed->origin_timestamp;
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -603,7 +603,7 @@ ReorderBufferTXNByXid(ReorderBuffer *rb, TransactionId xid, bool create,
 	if (is_new)
 		*is_new = !found;
 
-	Assert(!create || !!txn);
+	Assert(!create || txn != NULL);
 	return txn;
 }
 
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
@@ -209,23 +209,23 @@ PRINT_LWDEBUG(const char *where, LWLock *lock, LWLockMode mode)
 					 errmsg_internal("%d: %s(%s): excl %u shared %u haswaiters %u waiters %u rOK %d",
 							MyProcPid,
 							where, MainLWLockNames[id],
-							!!(state & LW_VAL_EXCLUSIVE),
+							(state & LW_VAL_EXCLUSIVE) != 0,
 							state & LW_SHARED_MASK,
-							!!(state & LW_FLAG_HAS_WAITERS),
+							(state & LW_FLAG_HAS_WAITERS) != 0,
 							pg_atomic_read_u32(&lock->nwaiters),
-							!!(state & LW_FLAG_RELEASE_OK))));
+							(state & LW_FLAG_RELEASE_OK) != 0)));
 		else
 			ereport(LOG,
 					(errhidestmt(true),
 					 errhidecontext(true),
 					 errmsg_internal("%d: %s(%s %d): excl %u shared %u haswaiters %u waiters %u rOK %d",
 							MyProcPid,
 							where, T_NAME(lock), id,
-							!!(state & LW_VAL_EXCLUSIVE),
+							(state & LW_VAL_EXCLUSIVE) != 0,
 							state & LW_SHARED_MASK,
-							!!(state & LW_FLAG_HAS_WAITERS),
+							(state & LW_FLAG_HAS_WAITERS) != 0,
 							pg_atomic_read_u32(&lock->nwaiters),
-							!!(state & LW_FLAG_RELEASE_OK))));
+							(state & LW_FLAG_RELEASE_OK) != 0)));
 	}
 }
 
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
@@ -149,9 +149,9 @@ typedef void (*SubXactCallback) (SubXactEvent event, SubTransactionId mySubid,
 
 /* Access macros for above flags */
 #define XactCompletionRelcacheInitFileInval(xinfo) \
-	(!!(xinfo & XACT_COMPLETION_UPDATE_RELCACHE_FILE))
+	((xinfo & XACT_COMPLETION_UPDATE_RELCACHE_FILE) != 0)
 #define XactCompletionForceSyncCommit(xinfo) \
-	(!!(xinfo & XACT_COMPLETION_FORCE_SYNC_COMMIT))
+	((xinfo & XACT_COMPLETION_FORCE_SYNC_COMMIT) != 0)
 
 typedef struct xl_xact_assignment
 {

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ sepgsql_avc_check_perms_label(const char *tcontext,`
`407`	`407`	`audit_name != SEPGSQL_AVC_NOAUDIT &&`
`408`	`408`	`sepgsql_get_mode() != SEPGSQL_MODE_INTERNAL)`
`409`	`409`	`{`
`410`		`- sepgsql_audit_log(!!denied,`
	`410`	`+ sepgsql_audit_log(denied != 0,`
`411`	`411`	`cache->scontext,`
`412`	`412`	`cache->tcontext_is_valid ?`
`413`	`413`	`cache->tcontext : sepgsql_avc_unlabeled(),`
Original file line number	Diff line number	Diff line change
`@@ -5335,7 +5335,8 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,`
`5335`	`5335`	`LWLockRelease(XidGenLock);`
`5336`	`5336`	`}`
`5337`	`5337`
`5338`		`- Assert(!!(parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == (origin_id != InvalidRepOriginId));`
	`5338`	`+ Assert(((parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == 0) ==`
	`5339`	`+ (origin_id == InvalidRepOriginId));`
`5339`	`5340`
`5340`	`5341`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`
`5341`	`5342`	`commit_time = parsed->origin_timestamp;`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ ReorderBufferTXNByXid(ReorderBuffer *rb, TransactionId xid, bool create,`
`603`	`603`	`if (is_new)`
`604`	`604`	`*is_new = !found;`
`605`	`605`
`606`		`- Assert(!create \|\| !!txn);`
	`606`	`+ Assert(!create \|\| txn != NULL);`
`607`	`607`	`return txn;`
`608`	`608`	`}`
`609`	`609`