Commit 788af6f8 authored by Peter Eisentraut's avatar Peter Eisentraut

Move atooid() definition to a central place

parent b5a38839
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
PG_MODULE_MAGIC; PG_MODULE_MAGIC;
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* /*
* This is the trigger that protects us from orphaned large objects * This is the trigger that protects us from orphaned large objects
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include "pg_getopt.h" #include "pg_getopt.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
#define BUFSIZE 1024 #define BUFSIZE 1024
enum trivalue enum trivalue
......
...@@ -51,8 +51,6 @@ ...@@ -51,8 +51,6 @@
#include "tcop/dest.h" #include "tcop/dest.h"
#include "utils/rel.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, * Bison doesn't allocate anything that needs to live across parser calls,
......
...@@ -52,9 +52,6 @@ ...@@ -52,9 +52,6 @@
#endif #endif
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
#define atoxid(x) ((TransactionId) strtoul((x), NULL, 10))
#define MAX_TOKEN 256 #define MAX_TOKEN 256
#define MAX_LINE 8192 #define MAX_LINE 8192
......
...@@ -164,8 +164,6 @@ ...@@ -164,8 +164,6 @@
*/ */
#define atoui(x) ((unsigned int) strtoul((x), NULL, 10)) #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 strtobool(x) ((*(x) == 't') ? true : false)
#define nullable_string(token,length) \ #define nullable_string(token,length) \
......
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/timestamp.h" #include "utils/timestamp.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* /*
* Common subroutine for num_nulls() and num_nonnulls(). * Common subroutine for num_nulls() and num_nonnulls().
......
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#include "streamutil.h" #include "streamutil.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
typedef struct TablespaceListCell typedef struct TablespaceListCell
{ {
struct TablespaceListCell *next; struct TablespaceListCell *next;
......
...@@ -97,8 +97,6 @@ extern char *output_files[]; ...@@ -97,8 +97,6 @@ extern char *output_files[];
#define CLUSTER_NAME(cluster) ((cluster) == &old_cluster ? "old" : \ #define CLUSTER_NAME(cluster) ((cluster) == &old_cluster ? "old" : \
(cluster) == &new_cluster ? "new" : "none") (cluster) == &new_cluster ? "new" : "none")
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* OID system catalog preservation added during PG 9.0 development */ /* OID system catalog preservation added during PG 9.0 development */
#define TABLE_SPACE_SUBDIRS_CAT_VER 201001111 #define TABLE_SPACE_SUBDIRS_CAT_VER 201001111
/* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */ /* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include "fe_utils/print.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 openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
extern bool setQFout(const char *fname); extern bool setQFout(const char *fname);
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include "common.h" #include "common.h"
#include "fe_utils/print.h" #include "fe_utils/print.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
static void help(const char *progname); static void help(const char *progname);
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include "pqexpbuffer.h" #include "pqexpbuffer.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* Global variables controlling behavior of fmtId() and fmtQualifiedId() */ /* Global variables controlling behavior of fmtId() and fmtQualifiedId() */
extern int quote_all_identifiers; extern int quote_all_identifiers;
extern PQExpBuffer (*getLocalPQExpBuffer) (void); extern PQExpBuffer (*getLocalPQExpBuffer) (void);
......
...@@ -39,6 +39,10 @@ typedef unsigned int Oid; ...@@ -39,6 +39,10 @@ typedef unsigned int Oid;
#define OID_MAX UINT_MAX #define OID_MAX UINT_MAX
/* you will need to include <limits.h> to use the above #define */ /* you will need to include <limits.h> to use the above #define */
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* the above needs <stdlib.h> */
/* Define a signed 64-bit integer type for use in client API declarations. */ /* Define a signed 64-bit integer type for use in client API declarations. */
typedef PG_INT64_TYPE pg_int64; typedef PG_INT64_TYPE pg_int64;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment