8000 Fix unused-variable warning on Windows. · postgres/postgres@0156315 · GitHub
[go: up one dir, main page]
Skip to content
{"payload":{"commit":{"oid":"01563158235f5650743fd9b1dfa80c3d8faf89bb","url":"/postgres/postgres/commit/01563158235f5650743fd9b1dfa80c3d8faf89bb","authoredDate":"2014-04-17T16:12:24.000-04:00","committedDate":"2014-04-17T16:12:24.000-04:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eFix unused-variable warning on Windows.\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"Introduced in \u003ca class=\"commit-link\" data-hovercard-type=\"commit\" data-hovercard-url=\"https://github.com/postgres/postgres/commit/585bca393640b609c54159e1bedd30a89fec5ea8/hovercard\" href=\"https://github.com/postgres/postgres/commit/585bca393640b609c54159e1bedd30a89fec5ea8\"\u003e\u003ctt\u003e585bca3\u003c/tt\u003e\u003c/a\u003e: msgid is not used in the Windows code path.\n\nAlso adjust comments a tad (mostly to keep pgindent from messing it up).\n\nDavid Rowley","authors":[{"login":"tglsfdc","displayName":"Tom Lane","avatarUrl":"https://avatars.githubusercontent.com/u/8755309?v=4","path":"/tglsfdc","isGitHub":false}],"committerAttribution":false,"committer":{"login":"tglsfdc","displayName":"Tom Lane","avatarUrl":"https://avatars.githubusercontent.com/u/8755309?v=4","path":"/tglsfdc","isGitHub":false},"pusher":null,"pushedDate":null,"parents":["9fe55259fd61fd9199907623f974caa7af66e780"],"globalRelayId":"MDY6Q29tbWl0OTI3NDQyOjAxNTYzMTU4MjM1ZjU2NTA3NDNmZDliMWRmYTgwYzNkOGZhZjg5YmI=","sha1":"9fe55259fd61fd9199907623f974caa7af66e780","sha2":"01563158235f5650743fd9b1dfa80c3d8faf89bb"},"currentUser":null,"repo":{"id":927442,"defaultBranch":"master","name":"postgres","ownerLogin":"postgres","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2010-09-21T11:35:45.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/177543?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":3361,"text":"@@ -3362,11 +3362,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","html":"@@ -3362,11 +3362,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","displayNoNewLineWarning":false,"position":0,"left":3361,"right":3361},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3362,"text":" \tint\t\t\tport = LDAP_DEF_PORT,","html":" \t\u003cspan class=pl-smi\u003eint\u003c/span\u003e\t\t\t\u003cspan class=pl-s1\u003eport\u003c/span\u003e \u003cspan class=pl-c1\u003e=\u003c/span\u003e \u003cspan class=pl-c1\u003eLDAP_DEF_PORT\u003c/span\u003e,","displayNoNewLineWarning":false,"position":1,"left":3362,"right":3362},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3363,"text":" \t\t\t\tscope,","html":" \t\t\t\t\u003cspan class=pl-s1\u003escope\u003c/span\u003e,","displayNoNewLineWarning":false,"position":2,"left":3363,"right":3363},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3364,"text":" \t\t\t\trc,","html":" \t\t\t\t\u003cspan class=pl-s1\u003erc\u003c/span\u003e,","displayNoNewLineWarning":false,"position":3,"left":3364,"right":3364},{"stylingDirective":null,"type":"DELETION","blobLineNumber":3365,"text":"-\t\t\t\tmsgid,","html":"-\t\t\t\t\u003cspan class=pl-s1\u003emsgid\u003c/span\u003e,","displayNoNewLineWarning":false,"position":4,"left":3365,"right":3364},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3365,"text":" \t\t\t\tsize,","html":" \t\t\t\t\u003cspan class=pl-s1\u003esize\u003c/span\u003e,","displayNoNewLineWarning":false,"position":5,"left":3366,"right":3365},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3366,"text":" \t\t\t\tstate,","html":" \t\t\t\t\u003cspan class=pl-s1\u003estate\u003c/span\u003e,","displayNoNewLineWarning":false,"position":6,"left":3367,"right":3366},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3367,"text":" \t\t\t\toldstate,","html":" \t\t\t\t\u003cspan class=pl-s1\u003eoldstate\u003c/span\u003e,","displayNoNewLineWarning":false,"position":7,"left":3368,"right":3367},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3368,"text":" \t\t\t\ti;","html":" \t\t\t\t\u003cspan class=pl-s1\u003ei\u003c/span\u003e;","displayNoNewLineWarning":false,"position":8,"left":3369,"right":3368},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3369,"text":"+#ifndef WIN32","html":"+\u003cspan class=pl-k\u003e#ifndef\u003c/span\u003e \u003cspan class=pl-c1\u003eWIN32\u003c/span\u003e","displayNoNewLineWarning":false,"position":9,"left":3369,"right":3369},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3370,"text":"+\tint\t\t\tmsgid;","html":"+\t\u003cspan class=pl-smi\u003eint\u003c/span\u003e\t\t\t\u003cspan class=pl-s1\u003emsgid\u003c/span\u003e;","displayNoNewLineWarning":false,"position":10,"left":3369,"right":3370},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3371,"text":"+#endif","html":"+\u003cspan class=pl-k\u003e#endif\u003c/span\u003e","displayNoNewLineWarning":false,"position":11,"left":3369,"right":3371},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3372,"text":" \tbool\t\tfound_keyword;","html":" \t\u003cspan class=pl-smi\u003ebool\u003c/span\u003e\t\t\u003cspan class=pl-s1\u003efound_keyword\u003c/span\u003e;","displayNoNewLineWarning":false,"position":12,"left":3370,"right":3372},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3373,"text":" \tchar\t *url,","html":" \t\u003cspan class=pl-smi\u003echar\u003c/span\u003e\t \u003cspan class=pl-c1\u003e*\u003c/span\u003e\u003cspan class=pl-s1\u003eurl\u003c/span\u003e,","displayNoNewLineWarning":false,"position":13,"left":3371,"right":3373},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3374,"text":" \t\t\t *hostname,","html":" \t\t\t \u003cspan class=pl-c1\u003e*\u003c/span\u003e\u003cspan class=pl-s1\u003ehostname\u003c/span\u003e,","displayNoNewLineWarning":false,"position":14,"left":3372,"right":3374},{"stylingDirective":null,"type":"HUNK","blobLineNumber":3512,"text":"@@ -3511,11 +3513,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","html":"@@ -3511,11 +3513,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","displayNoNewLineWarning":false,"position":15,"left":3510,"right":3512},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3513,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":16,"left":3511,"right":3513},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3514,"text":" \t/*","html":" \t\u003cspan class=pl-c\u003e/*\u003c/span\u003e","displayNoNewLineWarning":false,"position":17,"left":3512,"right":3514},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3515,"text":" \t * Perform an explicit anonymous bind.","html":" \u003cspan class=pl-c\u003e\t * Perform an explicit anonymous bind.\u003c/span\u003e","displayNoNewLineWarning":false,"position":18,"left":3513,"right":3515},{"stylingDirective":null,"type":"DELETION","blobLineNumber":3514,"text":"-\t * LDAP does not require that an anonymous bind is preformed explicitly,","html":"-\u003cspan class=pl-c\u003e\t * LDAP does not require that an anonymous bind is preformed explicitly,\u003c/span\u003e","displayNoNewLineWarning":false,"position":19,"left":3514,"right":3515},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3516,"text":"+\t *","html":"+\u003cspan class=pl-c\u003e\t *\u003c/span\u003e","displayNoNewLineWarning":false,"position":20,"left":3514,"right":3516},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3517,"text":"+\t * LDAP does not require that an anonymous bind is performed explicitly,","html":"+\u003cspan class=pl-c\u003e\t * LDAP does not require that an anonymous bind is performed explicitly,\u003c/span\u003e","displayNoNewLineWarning":false,"position":21,"left":3514,"right":3517},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3518,"text":" \t * but we want to distinguish between the case where LDAP bind does not","html":" \u003cspan class=pl-c\u003e\t * but we want to distinguish between the case where LDAP bind does not\u003c/span\u003e","displayNoNewLineWarning":false,"position":22,"left":3515,"right":3518},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3519,"text":" \t * succeed within PGLDAP_TIMEOUT seconds (return 2 to continue parsing","html":" \u003cspan class=pl-c\u003e\t * succeed within PGLDAP_TIMEOUT seconds (return 2 to continue parsing\u003c/span\u003e","displayNoNewLineWarning":false,"position":23,"left":3516,"right":3519},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3520,"text":" \t * the service control file) and the case where querying the LDAP server","html":" \u003cspan class=pl-c\u003e\t * the service control file) and the case where querying the LDAP server\u003c/span\u003e","displayNoNewLineWarning":false,"position":24,"left":3517,"right":3520},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3521,"text":" \t * fails (return 1 to end parsing).","html":" \u003cspan class=pl-c\u003e\t * fails (return 1 to end parsing).\u003c/span\u003e","displayNoNewLineWarning":false,"position":25,"left":3518,"right":3521},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3522,"text":"+\t *","html":"+\u003cspan class=pl-c\u003e\t *\u003c/span\u003e","displayNoNewLineWarning":false,"position":26,"left":3518,"right":3522},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3523,"text":" \t * Unfortunately there is no way of setting a timeout that works for","html":" \u003cspan class=pl-c\u003e\t * Unfortunately there is no way of setting a timeout that works for\u003c/span\u003e","displayNoNewLineWarning":false,"position":27,"left":3519,"right":3523},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3524,"text":" \t * both Windows and OpenLDAP.","html":" \u003cspan class=pl-c\u003e\t * both Windows and OpenLDAP.\u003c/span\u003e","displayNoNewLineWarning":false,"position":28,"left":3520,"right":3524},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3525,"text":" \t */","html":" \u003cspan class=pl-c\u003e\t */\u003c/span\u003e","displayNoNewLineWarning":false,"position":29,"left":3521,"right":3525},{"stylingDirective":null,"type":"HUNK","blobLineNumber":3531,"text":"@@ -3528,7 +3532,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","html":"@@ -3528,7 +3532,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","displayNoNewLineWarning":false,"position":30,"left":3527,"right":3531},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3532,"text":" \t\tldap_unbind(ld);","html":" \t\t\u003cspan class=pl-en\u003eldap_unbind\u003c/span\u003e(\u003cspan class=pl-s1\u003eld\u003c/span\u003e);","displayNoNewLineWarning":false,"position":31,"left":3528,"right":3532},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3533,"text":" \t\treturn 2;","html":" \t\t\u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-c1\u003e2\u003c/span\u003e;","displayNoNewLineWarning":false,"position":32,"left":3529,"right":3533},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3534,"text":" \t}","html":" \t}","displayNoNewLineWarning":false,"position":33,"left":3530,"right":3534},{"stylingDirective":null,"type":"DELETION","blobLineNumber":3531,"text":"-#else /* WIN32 */","html":"-\u003cspan class=\"pl-k\"\u003e#else\u003c/span\u003e \u003cspan class=\"pl-c\"\u003e/* WIN32 */\u003c/span\u003e","displayNoNewLineWarning":false,"position":34,"left":3531,"right":3534},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3535,"text":"+#else /* !WIN32 */","html":"+\u003cspan class=\"pl-k\"\u003e#else\u003c/span\u003e \u003cspan class=\"pl-c\"\u003e/* \u003cspan class=\"x x-first x-last\"\u003e!\u003c/span\u003eWIN32 */\u003c/span\u003e","displayNoNewLineWarning":false,"position":35,"left":3531,"right":3535},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3536,"text":" \t/* in OpenLDAP, use the LDAP_OPT_NETWORK_TIMEOUT option */","html":" \t\u003cspan class=pl-c\u003e/* in OpenLDAP, use the LDAP_OPT_NETWORK_TIMEOUT option */\u003c/span\u003e","displayNoNewLineWarning":false,"position":36,"left":3532,"right":3536},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3537,"text":" \tif (ldap_set_option(ld, LDAP_OPT_NETWORK_TIMEOUT, \u0026time) != LDAP_SUCCESS)","html":" \t\u003cspan class=pl-k\u003eif\u003c/span\u003e (\u003cspan class=pl-en\u003eldap_set_option\u003c/span\u003e(\u003cspan class=pl-s1\u003eld\u003c/span\u003e, \u003cspan class=pl-c1\u003eLDAP_OPT_NETWORK_TIMEOUT\u003c/span\u003e, \u003cspan class=pl-c1\u003e\u0026amp;\u003c/span\u003e\u003cspan class=pl-s1\u003etime\u003c/span\u003e) \u003cspan class=pl-c1\u003e!=\u003c/span\u003e \u003cspan class=pl-c1\u003eLDAP_SUCCESS\u003c/span\u003e)","displayNoNewLineWarning":false,"position":37,"left":3533,"right":3537},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3538,"text":" \t{","html":" \t{","displayNoNewLineWarning":false,"position":38,"left":3534,"right":3538},{"stylingDirective":null,"type":"HUNK","blobLineNumber":3786,"text":"@@ -3783,7 +3787,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","html":"@@ -3783,7 +3787,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,","displayNoNewLineWarning":false,"position":39,"left":3782,"right":3786},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3787,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":40,"left":3783,"right":3787},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3788,"text":" \treturn 0;","html":" \t\u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-c1\u003e0\u003c/span\u003e;","displayNoNewLineWarning":false,"position":41,"left":3784,"right":3788},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3789,"text":" }","html":" }","displayNoNewLineWarning":false,"position":42,"left":3785,"right":3789},{"stylingDirective":null,"type":"DELETION","blobLineNumber":3786,"text":"-#endif","html":"-\u003cspan class=pl-k\u003e#endif\u003c/span\u003e","displayNoNewLineWarning":false,"position":43,"left":3786,"right":3789},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3790,"text":"+","html":"+","displayNoNewLineWarning":false,"position":44,"left":3786,"right":3790},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3791,"text":"+#endif\t/* USE_LDAP */","html":"+\u003cspan class=pl-k\u003e#endif\u003c/span\u003e\t\u003cspan class=pl-c\u003e/* USE_LDAP */\u003c/span\u003e","displayNoNewLineWarning":false,"position":45,"left":3786,"right":3791},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3792,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":46,"left":3787,"right":3792},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3793,"text":" #define MAXBUFSIZE 256","html":" \u003cspan class=pl-k\u003e#define\u003c/span\u003e \u003cspan class=pl-c1\u003eMAXBUFSIZE\u003c/span\u003e 256","displayNoNewLineWarning":false,"position":47,"left":3788,"right":3793},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":3794,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":48,"left":3789,"right":3794}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":5819,"linesChanged":13,"newTreeEntry":{"lineCount":5819,"path":"src/interfaces/libpq/fe-connect.c","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"src/interfaces/libpq/fe-connect.c","mode":100644},"linesAdded":9,"linesDeleted":4,"path":"src/interfaces/libpq/fe-connect.c","pathDigest":"8d819454e061b9d4cdae9c8922ded05753a629d70f2ac1de1d4f6d5a4aeb7f68","status":"MODIFIED","truncatedReason":null,"oldOid":"9fe55259fd61fd9199907623f974caa7af66e780","newOid":"01563158235f5650743fd9b1dfa80c3d8faf89bb","copilotChatReference":null,"deletedSha":"9fe55259fd61fd9199907623f974caa7af66e780","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"repoOwnerGlobalRelayId":"MDEyOk9yZ2FuaXphdGlvbjE3NzU0Mw==","commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/postgres/postgres/commit/01563158235f5650743fd9b1dfa80c3d8faf89bb","fileTreeExpanded":true,"headerInfo":{"additions":9,"deletions":4,"filesChanged":1,"filesChangedString":"1"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":1,"truncated":false,"byteCount":1419,"lineShownCount":49},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"lI5oH5UsWXF8YEBSV76gJ0QsFuoiN4LQW9ja9AWdXo-ucN_FJbMlrtQOQGyIuV-4ecZBWty1S93aEfs5CvWXFQ"},"/users/diffview?diff=unified":{"post":"VxQiZfaqxLNdFVyywWXNxsgFAsY9Hgp3hFFD2pJpkxZt6pW_RjW4bPV7XIweYjJZ9e9VdsOcw3oFmGIXnQFajA"},"/notifications/thread":{"post":"7_dJ8CBai-9msJxb-mxhVkrW8VG10LmJW8hEqnCmTIytCAovBCYYC2qy7FCf6zTCsnFIQHFwi8ExLArcUpqKvQ"}}},"title":"Fix unused-variable warning on Windows. · postgres/postgres@0156315","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-2bfe39677d14.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"diff_ux_refresh_ssr_five":false,"diff_ux_refresh_ssr_ten":false,"show_pusher_on_commit_detail":false}}}

Commit 0156315

Browse files
tglsfdctglsfdc
committed
Fix unused-variable warning on Windows.
Introduced in 585bca3: msgid is not used in the Windows code path. Also adjust comments a tad (mostly to keep pgindent from messing it up). David Rowley
1 parent 9fe5525 commit 0156315

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

‎src/interfaces/libpq/fe-connect.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3362,11 +3362,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
33623362
int port = LDAP_DEF_PORT,
33633363
scope,
33643364
rc,
3365-
msgid,
33663365
size,
33673366
state,
33683367
oldstate,
33693368
i;
3369+
#ifndef WIN32
3370+
int msgid;
3371+
#endif
33703372
bool found_keyword;
33713373
char *url,
33723374
*hostname,
@@ -3511,11 +3513,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
35113513

35123514
/*
35133515
* Perform an explicit anonymous bind.
3514-
* LDAP does not require that an anonymous bind is preformed explicitly,
3516+
*
3517+
* LDAP does not require that an anonymous bind is performed explicitly,
35153518
* but we want to distinguish between the case where LDAP bind does not
35163519
* succeed within PGLDAP_TIMEOUT seconds (return 2 to continue parsing
35173520
* the service control file) and the case where querying the LDAP server
35183521
* fails (return 1 to end parsing).
3522+
*
35193523
* Unfortunately there is no way of setting a timeout that works for
35203524
* both Windows and OpenLDAP.
35213525
*/
@@ -3528,7 +3532,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
35283532
ldap_unbind(ld);
35293533
return 2;
35303534
}
3531-
#else /* WIN32 */
3535+
#else /* !WIN32 */
35323536
/* in OpenLDAP, use the LDAP_OPT_NETWORK_TIMEOUT option */
35333537
if (ldap_set_option(ld, LDAP_OPT_NETWORK_TIMEOUT, &time) != LDAP_SUCCESS)
35343538
{
@@ -3783,7 +3787,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
37833787

37843788
return 0;
37853789
}
3786-
#endif
3790+
3791+
#endif /* USE_LDAP */
37873792

37883793
#define MAXBUFSIZE 256
37893794

0 commit comments

Comments
 (0)
0