Move atooid() definition to a central place

diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 050bd8a72a731ffee62b3096b0ae6af2fbbc6cd6..6bd24309319f1bd90e9aa66ca2828b4604e3919c 100644 (file)
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -14,8 +14,6 @@
 
 PG_MODULE_MAGIC;
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 
 /*
  * This is the trigger that protects us from orphaned large objects

diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index d9dee2f7a0eb733435e2dbc2816e614758cea187..06f469067ba0f503c757601960ab48f0c342c9b1 100644 (file)
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -24,8 +24,6 @@
 #include "libpq-fe.h"
 #include "pg_getopt.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 #define BUFSIZE            1024
 
 enum trivalue

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 33d9f0b3c672e2a83dd6c0b802c7b7a956a28733..867f77076d074af13215c9c4d8afc15f8bbbcd87 100644 (file)
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -51,8 +51,6 @@
 #include "tcop/dest.h"
 #include "utils/rel.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 
 /*
  * Bison doesn't allocate anything that needs to live across parser calls,

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index be63a4bc637f245686bf4450aa427cce309b6e13..323bfa858d7121e8be2a60ec3b360997f7cd86b0 100644 (file)
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -52,9 +52,6 @@
 #endif
 
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-#define atoxid(x)  ((TransactionId) strtoul((x), NULL, 10))
-
 #define MAX_TOKEN  256
 #define MAX_LINE   8192
 

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index d2f69fe70ba366073b2fac21da67e8e4eecab8a3..05bf2e93e6b34bf6f02ce57508dbf9e891d0aaa3 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -164,8 +164,6 @@
  */
 #define atoui(x)  ((unsigned int) strtoul((x), NULL, 10))
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 #define strtobool(x)  ((*(x) == 't') ? true : false)
 
 #define nullable_string(token,length)  \

diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 0116fa08a618a73a589b1a4bc3a116bcf31de20c..8f7c1f81fd44cdd1b1c64ce31c320ba7d497cedc 100644 (file)
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -44,8 +44,6 @@
 #include "utils/builtins.h"
 #include "utils/timestamp.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 
 /*
  * Common subroutine for num_nulls() and num_nonnulls().

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 4b75e765bb8e2e44dfb66d028551c18857f01955..0a4944dd66ee861d226f69b0e805f439afedb7ae 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -39,8 +39,6 @@
 #include "streamutil.h"
 
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 typedef struct TablespaceListCell
 {
    struct TablespaceListCell *next;

diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 968ab8a668f315029e873ca900994f016e6b583f..b78b877903d7e777049a0474924dcb8602243f1f 100644 (file)
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -97,8 +97,6 @@ extern char *output_files[];
 #define CLUSTER_NAME(cluster)  ((cluster) == &old_cluster ? "old" : \
                                 (cluster) == &new_cluster ? "new" : "none")
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 /* OID system catalog preservation added during PG 9.0 development */
 #define TABLE_SPACE_SUBDIRS_CAT_VER 201001111
 /* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */

diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index dad0eb822a504facd79de788767b3f23dbed1a70..a83bc69ab7524f7b9f82922a60017d75e431ef79 100644 (file)
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -13,8 +13,6 @@
 #include "libpq-fe.h"
 #include "fe_utils/print.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 extern bool openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
 extern bool setQFout(const char *fname);
 

diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index ab0215d4954bb8f8fc72bc5a0ecb6a58fc809256..97d1de43ae8fb93c03e6a47ae90f3f2e8ff5ea2b 100644 (file)
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -14,8 +14,6 @@
 #include "common.h"
 #include "fe_utils/print.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 
 static void help(const char *progname);
 

diff --git a/src/include/fe_utils/string_utils.h b/src/include/fe_utils/string_utils.h
index 8f96a0b9919924530e07e1522f1a6b09b7025965..6fb7f5e30ecf8abd9b2fafaf4506382875e278ea 100644 (file)
--- a/src/include/fe_utils/string_utils.h
+++ b/src/include/fe_utils/string_utils.h
@@ -19,8 +19,6 @@
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
 
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
 /* Global variables controlling behavior of fmtId() and fmtQualifiedId() */
 extern int quote_all_identifiers;
 extern PQExpBuffer (*getLocalPQExpBuffer) (void);

diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h
index ae2f0877988cf8bc0c75e9080b94da13500cafe0..452eae9935e5523981659bb6ee78aef74d5b9c5c 100644 (file)
--- a/src/include/postgres_ext.h
+++ b/src/include/postgres_ext.h
@@ -39,6 +39,10 @@ typedef unsigned int Oid;
 #define OID_MAX  UINT_MAX
 /* you will need to include  to use the above #define */
 
+#define atooid(x) ((Oid) strtoul((x), NULL, 10))
+/* the above needs  */
+
+
 /* Define a signed 64-bit integer type for use in client API declarations. */
 typedef PG_INT64_TYPE pg_int64;