diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-10-08 11:33:45 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-10-08 11:33:45 +0000 |
| commit | 7d937cd40862cc94411842c34b5f1e6cb63e36c4 (patch) | |
| tree | 0c301c5e2e060f8779b0ef8f701ecf8932855351 | |
| parent | adeca513f717cf40596449c0ed90a907cf2ae20d (diff) | |
| download | postgresql-7d937cd40862cc94411842c34b5f1e6cb63e36c4.tar.gz postgresql-7d937cd40862cc94411842c34b5f1e6cb63e36c4.zip | |
Cosmetic changes to dblink.
| -rw-r--r-- | contrib/dblink/dblink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 61d992ed13a..cc02bdc80e9 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -116,6 +116,7 @@ typedef struct remoteConnHashEnt var_ = NULL; \ } \ } while (0) + #define DBLINK_RES_INTERNALERROR(p2) \ do { \ msg = pstrdup(PQerrorMessage(conn)); \ @@ -123,6 +124,7 @@ typedef struct remoteConnHashEnt PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ } while (0) + #define DBLINK_RES_ERROR(p2) \ do { \ msg = pstrdup(PQerrorMessage(conn)); \ @@ -133,6 +135,7 @@ typedef struct remoteConnHashEnt errmsg("%s", p2), \ errdetail("%s", msg))); \ } while (0) + #define DBLINK_RES_ERROR_AS_NOTICE(p2) \ do { \ msg = pstrdup(PQerrorMessage(conn)); \ @@ -143,6 +146,7 @@ typedef struct remoteConnHashEnt errmsg("%s", p2), \ errdetail("%s", msg))); \ } while (0) + #define DBLINK_CONN_NOT_AVAIL \ do { \ if(conname) \ @@ -154,6 +158,7 @@ typedef struct remoteConnHashEnt (errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST), \ errmsg("connection not available"))); \ } while (0) + #define DBLINK_GET_CONN \ do { \ char *conname_or_str = GET_STR(PG_GETARG_TEXT_P(0)); \ @@ -2039,7 +2044,7 @@ createConnHash(void) } static void -createNewConnection(const char *name, remoteConn * con) +createNewConnection(const char *name, remoteConn *rconn) { remoteConnHashEnt *hentry; bool found; @@ -2058,7 +2063,7 @@ createNewConnection(const char *name, remoteConn * con) (errcode(ERRCODE_DUPLICATE_OBJECT), errmsg("duplicate connection name"))); - hentry->rcon = con; + hentry->rcon = rconn; strncpy(hentry->name, name, NAMEDATALEN - 1); } |