------------------------------------------------------------ revno: 12605 revision-id: squid3@treenet.co.nz-20130909060927-kxpnvbut97idh1pu parent: squid3@treenet.co.nz-20130909060659-7dgp3vyvrzte2elz committer: Amos Jeffries branch nick: 3.3 timestamp: Mon 2013-09-09 00:09:27 -0600 message: Windows: fix error: variable 'h_error' set but not used ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130909060927-kxpnvbut97idh1pu # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 7a9065b215dd99ad7fb04fcdcb5579c4c38cb8aa # timestamp: 2013-09-09 06:09:49 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130909060659-\ # 7dgp3vyvrzte2elz # # Begin patch === modified file 'compat/getnameinfo.c' --- compat/getnameinfo.c 2012-10-04 11:10:17 +0000 +++ compat/getnameinfo.c 2013-09-09 06:09:27 +0000 @@ -158,7 +158,6 @@ int family, i; const char *addr; uint32_t v4a; - int h_error; char numserv[512]; if (sa == NULL) @@ -260,14 +259,17 @@ goto numeric; } else { #if USE_GETIPNODEBY + int h_error = 0; hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error); #else hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af); +#if 0 // getnameinfo.c:161:9: error: variable 'h_error' set but not used #if HAVE_H_ERRNO h_error = h_errno; #else h_error = EINVAL; #endif +#endif /* 0 */ #endif if (hp) {