Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite702b04

Browse files
committed
Avoid using s_addr as a local variable name, to work around broken
system headers on Unixware.
1 parent1a9a346 commite702b04

File tree

1 file changed

+13
-13
lines changed
  • src/backend/libpq

1 file changed

+13
-13
lines changed

‎src/backend/libpq/ip.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.21 2003/09/05 23:07:21 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.22 2003/09/08 00:56:13 tgl Exp $
1212
*
1313
* This file and the IPV6 implementation were initially provided by
1414
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -413,21 +413,21 @@ promote_v4_to_v6_addr(struct sockaddr_storage * addr)
413413
{
414414
structsockaddr_inaddr4;
415415
structsockaddr_in6addr6;
416-
uint32s_addr;
416+
uint32ip4addr;
417417

418418
memcpy(&addr4,addr,sizeof(addr4));
419-
s_addr=ntohl(addr4.sin_addr.s_addr);
419+
ip4addr=ntohl(addr4.sin_addr.s_addr);
420420

421421
memset(&addr6,0,sizeof(addr6));
422422

423423
addr6.sin6_family=AF_INET6;
424424

425425
addr6.sin6_addr.s6_addr[10]=0xff;
426426
addr6.sin6_addr.s6_addr[11]=0xff;
427-
addr6.sin6_addr.s6_addr[12]= (s_addr >>24)&0xFF;
428-
addr6.sin6_addr.s6_addr[13]= (s_addr >>16)&0xFF;
429-
addr6.sin6_addr.s6_addr[14]= (s_addr >>8)&0xFF;
430-
addr6.sin6_addr.s6_addr[15]= (s_addr)&0xFF;
427+
addr6.sin6_addr.s6_addr[12]= (ip4addr >>24)&0xFF;
428+
addr6.sin6_addr.s6_addr[13]= (ip4addr >>16)&0xFF;
429+
addr6.sin6_addr.s6_addr[14]= (ip4addr >>8)&0xFF;
430+
addr6.sin6_addr.s6_addr[15]= (ip4addr)&0xFF;
431431

432432
memcpy(addr,&addr6,sizeof(addr6));
433433
}
@@ -448,11 +448,11 @@ promote_v4_to_v6_mask(struct sockaddr_storage * addr)
448448
{
449449
structsockaddr_inaddr4;
450450
structsockaddr_in6addr6;
451-
uint32s_addr;
451+
uint32ip4addr;
452452
inti;
453453

454454
memcpy(&addr4,addr,sizeof(addr4));
455-
s_addr=ntohl(addr4.sin_addr.s_addr);
455+
ip4addr=ntohl(addr4.sin_addr.s_addr);
456456

457457
memset(&addr6,0,sizeof(addr6));
458458

@@ -461,10 +461,10 @@ promote_v4_to_v6_mask(struct sockaddr_storage * addr)
461461
for (i=0;i<12;i++)
462462
addr6.sin6_addr.s6_addr[i]=0xff;
463463

464-
addr6.sin6_addr.s6_addr[12]= (s_addr >>24)&0xFF;
465-
addr6.sin6_addr.s6_addr[13]= (s_addr >>16)&0xFF;
466-
addr6.sin6_addr.s6_addr[14]= (s_addr >>8)&0xFF;
467-
addr6.sin6_addr.s6_addr[15]= (s_addr)&0xFF;
464+
addr6.sin6_addr.s6_addr[12]= (ip4addr >>24)&0xFF;
465+
addr6.sin6_addr.s6_addr[13]= (ip4addr >>16)&0xFF;
466+
addr6.sin6_addr.s6_addr[14]= (ip4addr >>8)&0xFF;
467+
addr6.sin6_addr.s6_addr[15]= (ip4addr)&0xFF;
468468

469469
memcpy(addr,&addr6,sizeof(addr6));
470470
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp