Fix mixups of FooGetDatum() vs. DatumGetFoo()

Some of these were accidentally reversed, but there was no ill effect.

Reviewed-by: Tom Lane <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/8246d7ff-f4b7-4363-913e-827dadfeb145%40eisentraut.org

diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 294821231fc3b9239277c642ffdfea02e082d41c..4e2e8891cddfdfc1e81d5fc4a2069c8a39b2c846 100644 (file)
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -506,7 +506,7 @@ bt_page_print_tuples(ua_page_items *uargs)
 
    j = 0;
    memset(nulls, 0, sizeof(nulls));
-   values[j++] = DatumGetInt16(offset);
+   values[j++] = Int16GetDatum(offset);
    values[j++] = ItemPointerGetDatum(&itup->t_tid);
    values[j++] = Int32GetDatum((int) IndexTupleSize(itup));
    values[j++] = BoolGetDatum(IndexTupleHasNulls(itup));

diff --git a/contrib/pageinspect/gistfuncs.c b/contrib/pageinspect/gistfuncs.c
index 7b16e2a1ef33cdd89affc72f2a6c3b33b52f55fa..1b299374890b0f1eeadae91b951c6d0e1ca75c4b 100644 (file)
--- a/contrib/pageinspect/gistfuncs.c
+++ b/contrib/pageinspect/gistfuncs.c
@@ -174,7 +174,7 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
 
        memset(nulls, 0, sizeof(nulls));
 
-       values[0] = DatumGetInt16(offset);
+       values[0] = Int16GetDatum(offset);
        values[1] = ItemPointerGetDatum(&itup->t_tid);
        values[2] = Int32GetDatum((int) IndexTupleSize(itup));
 
@@ -281,7 +281,7 @@ gist_page_items(PG_FUNCTION_ARGS)
 
        memset(nulls, 0, sizeof(nulls));
 
-       values[0] = DatumGetInt16(offset);
+       values[0] = Int16GetDatum(offset);
        values[1] = ItemPointerGetDatum(&itup->t_tid);
        values[2] = Int32GetDatum((int) IndexTupleSize(itup));
        values[3] = BoolGetDatum(ItemIdIsDead(id));

diff --git a/src/backend/access/common/printsimple.c b/src/backend/access/common/printsimple.c
index f346ab3e8125b20695a4138d05ec1be6ab6f17ad..a09c8fcd3323eabdb2443f37492de0a01853a44c 100644 (file)
--- a/src/backend/access/common/printsimple.c
+++ b/src/backend/access/common/printsimple.c
@@ -123,7 +123,7 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 
            case OIDOID:
                {
-                   Oid         num = ObjectIdGetDatum(value);
+                   Oid         num = DatumGetObjectId(value);
                    char        str[10];    /* 10 digits */
                    int         len;
 

diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 4da5a3c1d161dfda93e52447917d681d0781156f..e1b52acd20dc249b3856e7257bba184fc943edd0 100644 (file)
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -555,7 +555,7 @@ btcharcmp(PG_FUNCTION_ARGS)
 static Datum
 char_decrement(Relation rel, Datum existing, bool *underflow)
 {
-   uint8       cexisting = UInt8GetDatum(existing);
+   uint8       cexisting = DatumGetUInt8(existing);
 
    if (cexisting == 0)
    {
@@ -571,7 +571,7 @@ char_decrement(Relation rel, Datum existing, bool *underflow)
 static Datum
 char_increment(Relation rel, Datum existing, bool *overflow)
 {
-   uint8       cexisting = UInt8GetDatum(existing);
+   uint8       cexisting = DatumGetUInt8(existing);
 
    if (cexisting == UCHAR_MAX)
    {

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 5553c20fee8cee70536fff90dcebc1ba2a186cff..9a4de1616bcc910a78cb2be4a174934eccc89800 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9011,7 +9011,7 @@ do_pg_backup_start(const char *backupidstr, bool fast, List **tablespaces,
     * work correctly, it is critical that sessionBackupState is only updated
     * after this block is over.
     */
-   PG_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, DatumGetBool(true));
+   PG_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, BoolGetDatum(true));
    {
        bool        gotUniqueStartpoint = false;
        DIR        *tblspcdir;
@@ -9250,7 +9250,7 @@ do_pg_backup_start(const char *backupidstr, bool fast, List **tablespaces,
 
        state->starttime = (pg_time_t) time(NULL);
    }
-   PG_END_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, DatumGetBool(true));
+   PG_END_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, BoolGetDatum(true));
 
    state->started_in_recovery = backup_started_in_recovery;
 
@@ -9590,7 +9590,7 @@ register_persistent_abort_backup_handler(void)
 
    if (already_done)
        return;
-   before_shmem_exit(do_pg_abort_backup, DatumGetBool(false));
+   before_shmem_exit(do_pg_abort_backup, BoolGetDatum(false));
    already_done = true;
 }