Add support for EUI-64 MAC addresses as macaddr8

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

diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 78a702a13ec6eb42931de99e94cffd995c030472..1b849e870354d9ca6c54f9175cd1b33b20ab6857 100644 (file)
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -4,17 +4,19 @@
  *       Functions for the built-in type "char" (not to be confused with
  *       bpchar, which is the SQL CHAR(n) type).
  *
- * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.37 2003/08/04 00:43:25 momjian Exp $
+ *       src/backend/utils/adt/char.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include <limits.h>
+
 #include "libpq/pqformat.h"
 #include "utils/builtins.h"
 
@@ -57,7 +59,7 @@ charout(PG_FUNCTION_ARGS)
  *             charrecv                        - converts external binary format to char
  *
  * The external representation is one byte, with no character set
- * conversion. This is somewhat dubious, perhaps, but in many
+ * conversion.  This is somewhat dubious, perhaps, but in many
  * cases people use char for a 1-byte binary type.
  */
 Datum
@@ -88,7 +90,7 @@ charsend(PG_FUNCTION_ARGS)
 
 /*
  * NOTE: comparisons are done as though char is unsigned (uint8).
- * Arithmetic is done as though char is signed (int8).
+ * Conversions to and from integer are done as though char is signed (int8).
  *
  * You wanted consistency?
  */
@@ -147,61 +149,42 @@ charge(PG_FUNCTION_ARGS)
        PG_RETURN_BOOL((uint8) arg1 >= (uint8) arg2);
 }
 
-Datum
-charpl(PG_FUNCTION_ARGS)
-{
-       char            arg1 = PG_GETARG_CHAR(0);
-       char            arg2 = PG_GETARG_CHAR(1);
-
-       PG_RETURN_CHAR((int8) arg1 + (int8) arg2);
-}
 
 Datum
-charmi(PG_FUNCTION_ARGS)
+chartoi4(PG_FUNCTION_ARGS)
 {
        char            arg1 = PG_GETARG_CHAR(0);
-       char            arg2 = PG_GETARG_CHAR(1);
 
-       PG_RETURN_CHAR((int8) arg1 - (int8) arg2);
+       PG_RETURN_INT32((int32) ((int8) arg1));
 }
 
 Datum
-charmul(PG_FUNCTION_ARGS)
+i4tochar(PG_FUNCTION_ARGS)
 {
-       char            arg1 = PG_GETARG_CHAR(0);
-       char            arg2 = PG_GETARG_CHAR(1);
-
-       PG_RETURN_CHAR((int8) arg1 * (int8) arg2);
-}
-
-Datum
-chardiv(PG_FUNCTION_ARGS)
-{
-       char            arg1 = PG_GETARG_CHAR(0);
-       char            arg2 = PG_GETARG_CHAR(1);
+       int32           arg1 = PG_GETARG_INT32(0);
 
-       if (arg2 == 0)
+       if (arg1 < SCHAR_MIN || arg1 > SCHAR_MAX)
                ereport(ERROR,
-                               (errcode(ERRCODE_DIVISION_BY_ZERO),
-                                errmsg("division by zero")));
+                               (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+                                errmsg("\"char\" out of range")));
 
-       PG_RETURN_CHAR((int8) arg1 / (int8) arg2);
+       PG_RETURN_CHAR((int8) arg1);
 }
 
 
 Datum
 text_char(PG_FUNCTION_ARGS)
 {
-       text       *arg1 = PG_GETARG_TEXT_P(0);
+       text       *arg1 = PG_GETARG_TEXT_PP(0);
        char            result;
 
        /*
-        * An empty input string is converted to \0 (for consistency with
-        * charin). If the input is longer than one character, the excess data
-        * is silently discarded.
+        * An empty input string is converted to \0 (for consistency with charin).
+        * If the input is longer than one character, the excess data is silently
+        * discarded.
         */
-       if (VARSIZE(arg1) > VARHDRSZ)
-               result = *(VARDATA(arg1));
+       if (VARSIZE_ANY_EXHDR(arg1) > 0)
+               result = *(VARDATA_ANY(arg1));
        else
                result = '\0';
 
@@ -220,11 +203,11 @@ char_text(PG_FUNCTION_ARGS)
         */
        if (arg1 != '\0')
        {
-               VARATT_SIZEP(result) = VARHDRSZ + 1;
+               SET_VARSIZE(result, VARHDRSZ + 1);
                *(VARDATA(result)) = arg1;
        }
        else
-               VARATT_SIZEP(result) = VARHDRSZ;
+               SET_VARSIZE(result, VARHDRSZ);
 
        PG_RETURN_TEXT_P(result);
 }