database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

Remove AssertArg and AssertState

Browse Source 
These don't offer anything over plain Assert, and their usage had
already been declared obsolescent.

Author: Nathan Bossart <nathandbossart@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/20221009210148.GA900071@nathanxps13
This commit is contained in:
Peter Eisentraut
2022-10-28 09:19:06 +02:00
parent d37aa3d358
commit b1099eca8f
44 changed files with 162 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/tcop/postgres.c
View File

@@ -4050,8 +4050,8 @@ PostgresMain(const char *dbname, const char *username)
bool idle_in_transaction_timeout_enabled = false;
bool idle_session_timeout_enabled = false;
AssertArg(dbname != NULL);
AssertArg(username != NULL);
Assert(dbname != NULL);
Assert(username != NULL);
SetProcessingMode(InitProcessing);

8
src/backend/tcop/pquery.c
View File

@@ -440,8 +440,8 @@ PortalStart(Portal portal, ParamListInfo params,
QueryDesc *queryDesc;
int myeflags;
AssertArg(PortalIsValid(portal));
AssertState(portal->status == PORTAL_DEFINED);
Assert(PortalIsValid(portal));
Assert(portal->status == PORTAL_DEFINED);
/*
* Set up global portal context pointers.
@@ -694,7 +694,7 @@ PortalRun(Portal portal, long count, bool isTopLevel, bool run_once,
MemoryContext savePortalContext;
MemoryContext saveMemoryContext;
AssertArg(PortalIsValid(portal));
Assert(PortalIsValid(portal));
TRACE_POSTGRESQL_QUERY_EXECUTE_START();
@@ -1399,7 +1399,7 @@ PortalRunFetch(Portal portal,
MemoryContext savePortalContext;
MemoryContext oldContext;
AssertArg(PortalIsValid(portal));
Assert(PortalIsValid(portal));
/*
* Check for improper portal use, and mark portal active.