Add support for EUI-64 MAC addresses as macaddr8

[postgresql] / src / backend / utils / adt / tid.c

diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 6e2bbdc7e9dad66560f17eb73831a9c509b4e2ce..49a5a157b94e24b5781c0f9bb6cb09c56c03891a 100644 (file)
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -3,7 +3,7 @@
  * tid.c
  *       Functions for the built-in type tuple id
  *
- * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -32,6 +32,7 @@
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
+#include "utils/varlena.h"
 
 
 #define DatumGetItemPointer(X)  ((ItemPointer) DatumGetPointer(X))
@@ -68,24 +69,24 @@ tidin(PG_FUNCTION_ARGS)
        if (i < NTIDARGS)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type tid: \"%s\"",
-                                               str)));
+                                errmsg("invalid input syntax for type %s: \"%s\"",
+                                               "tid", str)));
 
        errno = 0;
        blockNumber = strtoul(coord[0], &badp, 10);
        if (errno || *badp != DELIM)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type tid: \"%s\"",
-                                               str)));
+                                errmsg("invalid input syntax for type %s: \"%s\"",
+                                               "tid", str)));
 
        hold_offset = strtol(coord[1], &badp, 10);
        if (errno || *badp != RDELIM ||
                hold_offset > USHRT_MAX || hold_offset < 0)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type tid: \"%s\"",
-                                               str)));
+                                errmsg("invalid input syntax for type %s: \"%s\"",
+                                               "tid", str)));
 
        offsetNumber = hold_offset;
 
@@ -367,7 +368,7 @@ currtid_byreloid(PG_FUNCTION_ARGS)
 Datum
 currtid_byrelname(PG_FUNCTION_ARGS)
 {
-       text       *relname = PG_GETARG_TEXT_P(0);
+       text       *relname = PG_GETARG_TEXT_PP(0);
        ItemPointer tid = PG_GETARG_ITEMPOINTER(1);
        ItemPointer result;
        RangeVar   *relrv;