database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-26 01:22:12 +03:00
Code Activity

Cosmetic changes to dblink.

Browse Source
This commit is contained in:
Bruce Momjian
2005-10-08 11:33:45 +00:00
parent adeca513f7
commit 7d937cd408
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/dblink/dblink.c
View File

@ -116,6 +116,7 @@ typedef struct remoteConnHashEnt
var_ = NULL; \ var_ = NULL; \
} \ } \
} while (0) } while (0)
#define DBLINK_RES_INTERNALERROR(p2) \ #define DBLINK_RES_INTERNALERROR(p2) \
do { \ do { \
msg = pstrdup(PQerrorMessage(conn)); \ msg = pstrdup(PQerrorMessage(conn)); \
@ -123,6 +124,7 @@ typedef struct remoteConnHashEnt
PQclear(res); \ PQclear(res); \
elog(ERROR, "%s: %s", p2, msg); \ elog(ERROR, "%s: %s", p2, msg); \
} while (0) } while (0)
#define DBLINK_RES_ERROR(p2) \ #define DBLINK_RES_ERROR(p2) \
do { \ do { \
msg = pstrdup(PQerrorMessage(conn)); \ msg = pstrdup(PQerrorMessage(conn)); \
@ -133,6 +135,7 @@ typedef struct remoteConnHashEnt
errmsg("%s", p2), \ errmsg("%s", p2), \
errdetail("%s", msg))); \ errdetail("%s", msg))); \
} while (0) } while (0)
#define DBLINK_RES_ERROR_AS_NOTICE(p2) \ #define DBLINK_RES_ERROR_AS_NOTICE(p2) \
do { \ do { \
msg = pstrdup(PQerrorMessage(conn)); \ msg = pstrdup(PQerrorMessage(conn)); \
@ -143,6 +146,7 @@ typedef struct remoteConnHashEnt
errmsg("%s", p2), \ errmsg("%s", p2), \
errdetail("%s", msg))); \ errdetail("%s", msg))); \
} while (0) } while (0)
#define DBLINK_CONN_NOT_AVAIL \ #define DBLINK_CONN_NOT_AVAIL \
do { \ do { \
if(conname) \ if(conname) \
@ -154,6 +158,7 @@ typedef struct remoteConnHashEnt
(errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST), \ (errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST), \
errmsg("connection not available"))); \ errmsg("connection not available"))); \
} while (0) } while (0)
#define DBLINK_GET_CONN \ #define DBLINK_GET_CONN \
do { \ do { \
char *conname_or_str = GET_STR(PG_GETARG_TEXT_P(0)); \ char *conname_or_str = GET_STR(PG_GETARG_TEXT_P(0)); \
@ -2039,7 +2044,7 @@ createConnHash(void)
} }
static void static void
createNewConnection(const char *name, remoteConn * con) createNewConnection(const char *name, remoteConn *rconn)
{ {
remoteConnHashEnt *hentry; remoteConnHashEnt *hentry;
bool found; bool found;
@ -2058,7 +2063,7 @@ createNewConnection(const char *name, remoteConn * con)
(errcode(ERRCODE_DUPLICATE_OBJECT), (errcode(ERRCODE_DUPLICATE_OBJECT),
errmsg("duplicate connection name"))); errmsg("duplicate connection name")));
hentry->rcon = con; hentry->rcon = rconn;
strncpy(hentry->name, name, NAMEDATALEN - 1); strncpy(hentry->name, name, NAMEDATALEN - 1);
} }