diff options
| author | Peter Eisentraut | 2022-10-28 07:19:06 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2022-10-28 07:19:06 +0000 |
| commit | b1099eca8f38ff5cfaf0901bb91cb6a22f909bc6 (patch) | |
| tree | 8ef29d9ee5911b059c8ecd2123b50c411cfc7a9e /src/backend/tcop | |
| parent | d37aa3d35832afde94e100c4d2a9618b3eb76472 (diff) | |
Remove AssertArg and AssertState
These don't offer anything over plain Assert, and their usage had
already been declared obsolescent.
Author: Nathan Bossart <[email protected]>
Reviewed-by: Michael Paquier <[email protected]>
Discussion: https://www.postgresql.org/message-id/20221009210148.GA900071@nathanxps13
Diffstat (limited to 'src/backend/tcop')
| -rw-r--r-- | src/backend/tcop/postgres.c | 4 | ||||
| -rw-r--r-- | src/backend/tcop/pquery.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index a9a1851c946..3082093d1ea 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -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); diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 5aa5a350f38..52e2db6452b 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -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. |