Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7d937cd

Browse files
committed
Cosmetic changes to dblink.
1 parent adeca51 commit 7d937cd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

contrib/dblink/dblink.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,15 @@ typedef struct remoteConnHashEnt
116116
var_ = NULL; \
117117
} \
118118
} while (0)
119+
119120
#define DBLINK_RES_INTERNALERROR(p2) \
120121
do { \
121122
msg = pstrdup(PQerrorMessage(conn)); \
122123
if (res) \
123124
PQclear(res); \
124125
elog(ERROR, "%s: %s", p2, msg); \
125126
} while (0)
127+
126128
#define DBLINK_RES_ERROR(p2) \
127129
do { \
128130
msg = pstrdup(PQerrorMessage(conn)); \
@@ -133,6 +135,7 @@ typedef struct remoteConnHashEnt
133135
errmsg("%s", p2), \
134136
errdetail("%s", msg))); \
135137
} while (0)
138+
136139
#define DBLINK_RES_ERROR_AS_NOTICE(p2) \
137140
do { \
138141
msg = pstrdup(PQerrorMessage(conn)); \
@@ -143,6 +146,7 @@ typedef struct remoteConnHashEnt
143146
errmsg("%s", p2), \
144147
errdetail("%s", msg))); \
145148
} while (0)
149+
146150
#define DBLINK_CONN_NOT_AVAIL \
147151
do { \
148152
if(conname) \
@@ -154,6 +158,7 @@ typedef struct remoteConnHashEnt
154158
(errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST), \
155159
errmsg("connection not available"))); \
156160
} while (0)
161+
157162
#define DBLINK_GET_CONN \
158163
do { \
159164
char *conname_or_str = GET_STR(PG_GETARG_TEXT_P(0)); \
@@ -2039,7 +2044,7 @@ createConnHash(void)
20392044
}
20402045

20412046
static void
2042-
createNewConnection(const char *name, remoteConn * con)
2047+
createNewConnection(const char *name, remoteConn *rconn)
20432048
{
20442049
remoteConnHashEnt *hentry;
20452050
bool found;
@@ -2058,7 +2063,7 @@ createNewConnection(const char *name, remoteConn * con)
20582063
(errcode(ERRCODE_DUPLICATE_OBJECT),
20592064
errmsg("duplicate connection name")));
20602065

2061-
hentry->rcon = con;
2066+
hentry->rcon = rconn;
20622067
strncpy(hentry->name, name, NAMEDATALEN - 1);
20632068
}
20642069

0 commit comments

Comments
 (0)