Bug in current network.c

Started by Andreas Zeugswetterabout 27 years ago4 messages
#1Andreas Zeugswetter
andreas.zeugswetter@telecom.at

The network.c from current CVS has:

xlc -I../../../include -I../../../backend -I/usr/local/include
-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero -qlonglong
-g -qfullpath -I../.. -c network.c -o network.o
400 | if (inet_cidr_ntop(2, &addr, (((inet_struct
*)(((struct varlena *)(ip))->vl_dat))->bits), tmp, sizeof(tmp)) < 0)

.............................................................
...............................................................a...
a - 1506-068 (S) Operation between types "char*" and "int" is not allowed.
gmake[3]: *** [network.o] Error 1

It should probably read as follows: (but please check)
(I sure hope it comes without those stupid wraps my mailer always
generates)

*** network.c.ori	Thu Oct 29 09:51:42 1998
--- network.c	Thu Oct 29 10:35:59 1998
***************
*** 397,403 ****
  		/* It's an IP V4 address: */
  		int	addr = htonl(ntohl(ip_v4addr(ip)) & (0xffffffff << (32 - 
ip_bits(ip))));
! 		if (inet_cidr_ntop(AF_INET, &addr, ip_bits(ip), tmp, sizeof(tmp)) < 0)
  		{
  			elog(ERROR, "unable to print network (%s)", strerror(errno));
  			return (NULL);
--- 397,403 ----
  		/* It's an IP V4 address: */
  		int	addr = htonl(ntohl(ip_v4addr(ip)) & (0xffffffff << (32 - 
ip_bits(ip))));

! if (inet_cidr_ntop(AF_INET, &addr, ip_bits(ip), tmp, sizeof(tmp)) ==
NULL)
{
elog(ERROR, "unable to print network (%s)", strerror(errno));
return (NULL);

Attached is also a correct inet.out

begin 600 inet.out
M455%4EDZ($123U @5$%"3$4@24Y%5%]40DP["D524D]2.B @4F5L871I;VX@
M:6YE=%]T8FP@1&]E<R!.;W0@17AI<W0A"E%515)9.B!#4D5!5$4@5$%"3$4@
M24Y%5%]40DP@*&,@8VED<BP@:2!I;F5T*3L*455%4EDZ($E.4T525"!)3E1/
M($E.151?5$),("AC+"!I*2!604Q515,@*"<Q.3(N,38X+C$G+" G,3DR+C$V
M."XQ+C(R-B\R-"<I.PI1545263H@24Y315)4($E.5$\@24Y%5%]40DP@*&,L
M(&DI(%9!3%5%4R H)S$Y,BXQ-C@N,2XR+S(T)RP@)S$Y,BXQ-C@N,2XR,C8G
M*3L*455%4EDZ($E.4T525"!)3E1/($E.151?5$),("AC+"!I*2!604Q515,@
M*"<Q,"<L("<Q,"XQ+C(N,R\X)RD["E%515)9.B!)3E-%4E0@24Y43R!)3D54
M7U1"3" H8RP@:2D@5D%,5453("@G,3 N,"XP+C G+" G,3 N,2XR+C,O."<I
M.PI1545263H@24Y315)4($E.5$\@24Y%5%]40DP@*&,L(&DI(%9!3%5%4R H
M)S$P+C$N,BXS)RP@)S$P+C$N,BXS+S,R)RD["E%515)9.B!)3E-%4E0@24Y4
M3R!)3D547U1"3" H8RP@:2D@5D%,5453("@G,3 N,2XR)RP@)S$P+C$N,BXS
M+S(T)RD["E%515)9.B!)3E-%4E0@24Y43R!)3D547U1"3" H8RP@:2D@5D%,
M5453("@G,3 N,2<L("<Q,"XQ+C(N,R\Q-B<I.PI1545263H@24Y315)4($E.
M5$\@24Y%5%]40DP@*&,L(&DI(%9!3%5%4R H)S$P)RP@)S$P+C$N,BXS+S@G
M*3L*455%4EDZ(%-%3$5#5" G)R!A<R!E:6=H="P@8R!A<R!C:61R+"!I(&%S
M(&EN970@1E)/32!)3D547U1"3#L*96EG:'1\8VED<B @(" @(" @?&EN970@
M(" @(" @(" @(" *+2TM+2TK+2TM+2TM+2TM+2TM*RTM+2TM+2TM+2TM+2TM
M+2T*(" @("!\,3DR+C$V."XQ+S(T?#$Y,BXQ-C@N,2XR,C8O,C0*(" @("!\
M,3DR+C$V."XQ+S(T?#$Y,BXQ-C@N,2XR,C8@(" *(" @("!\,3 O." @(" @
M(" @?#$P+C$N,BXS+S@@(" @(" *(" @("!\,3 N,"XP+C O,S(@?#$P+C$N
M,BXS+S@@(" @(" *(" @("!\,3 N,2XR+C,O,S(@?#$P+C$N,BXS(" @(" @
M(" *(" @("!\,3 N,2XR+S(T(" @?#$P+C$N,BXS+S(T(" @(" *(" @("!\
M,3 N,2\Q-B @(" @?#$P+C$N,BXS+S$V(" @(" *(" @("!\,3 O." @(" @
M(" @?#$P+C$N,BXS+S@@(" @(" **#@@<F]W<RD*"E%515)9.B!314Q%0U0@
M)R<@87,@96EG:'0L(&D@87,@:6YE="P@:&]S="AI*2!&4D]-($E.151?5$),
M.PIE:6=H='QI;F5T(" @(" @(" @(" @?" @(" @(" @(&AO<W0*+2TM+2TK
M+2TM+2TM+2TM+2TM+2TM+2LM+2TM+2TM+2TM+2TM"B @(" @?#$Y,BXQ-C@N
M,2XR,C8O,C1\,3DR+C$V."XQ+C(R-@H@(" @('PQ.3(N,38X+C$N,C(V(" @
M?#$Y,BXQ-C@N,2XR,C8*(" @("!\,3 N,2XR+C,O." @(" @('P@(" @(#$P
M+C$N,BXS"B @(" @?#$P+C$N,BXS+S@@(" @("!\(" @(" Q,"XQ+C(N,PH@
M(" @('PQ,"XQ+C(N,R @(" @(" @?" @(" @,3 N,2XR+C,*(" @("!\,3 N
M,2XR+C,O,C0@(" @('P@(" @(#$P+C$N,BXS"B @(" @?#$P+C$N,BXS+S$V
M(" @("!\(" @(" Q,"XQ+C(N,PH@(" @('PQ,"XQ+C(N,R\X(" @(" @?" @
M(" @,3 N,2XR+C,**#@@<F]W<RD*"E%515)9.B!314Q%0U0@)R<@87,@96EG
M:'0L(&,@87,@8VED<BP@8G)O861C87-T*&,I+ H@(&D@87,@:6YE="P@8G)O
M861C87-T*&DI($923TT@24Y%5%]40DP["F5I9VAT?&-I9'(@(" @(" @('P@
M(" @(&)R;V%D8V%S='QI;F5T(" @(" @(" @(" @?" @(" @8G)O861C87-T
M"BTM+2TM*RTM+2TM+2TM+2TM+2LM+2TM+2TM+2TM+2TM+2LM+2TM+2TM+2TM
M+2TM+2TM*RTM+2TM+2TM+2TM+2TM"B @(" @?#$Y,BXQ-C@N,2\R-'P@,3DR
M+C$V."XQ+C(U-7PQ.3(N,38X+C$N,C(V+S(T?" Q.3(N,38X+C$N,C4U"B @
M(" @?#$Y,BXQ-C@N,2\R-'P@,3DR+C$V."XQ+C(U-7PQ.3(N,38X+C$N,C(V
M(" @?" Q.3(N,38X+C$N,C(V"B @(" @?#$P+S@@(" @(" @('PQ,"XR-34N
M,C4U+C(U-7PQ,"XQ+C(N,R\X(" @(" @?#$P+C(U-2XR-34N,C4U"B @(" @
M?#$P+C N,"XP+S,R('P@(" @(" Q,"XP+C N,'PQ,"XQ+C(N,R\X(" @(" @
M?#$P+C(U-2XR-34N,C4U"B @(" @?#$P+C$N,BXS+S,R('P@(" @(" Q,"XQ
M+C(N,WPQ,"XQ+C(N,R @(" @(" @?" @(" @(#$P+C$N,BXS"B @(" @?#$P
M+C$N,B\R-" @('P@(" @,3 N,2XR+C(U-7PQ,"XQ+C(N,R\R-" @(" @?" @
M(" Q,"XQ+C(N,C4U"B @(" @?#$P+C$O,38@(" @('P@(#$P+C$N,C4U+C(U
M-7PQ,"XQ+C(N,R\Q-B @(" @?" @,3 N,2XR-34N,C4U"B @(" @?#$P+S@@
M(" @(" @('PQ,"XR-34N,C4U+C(U-7PQ,"XQ+C(N,R\X(" @(" @?#$P+C(U
M-2XR-34N,C4U"B@X(')O=W,I"@I1545263H@4T5,14-4("<G(&%S(&5I9VAT
M+"!C(&%S(&-I9'(L(&YE='=O<FLH8RD@87,@(FYE='=O<FLH8VED<BDB+ H@
M(&D@87,@:6YE="P@;F5T=V]R:RAI*2!A<R B;F5T=V]R:RAI;F5T*2(@1E)/
M32!)3D547U1"3#L*96EG:'1\8VED<B @(" @(" @?&YE='=O<FLH8VED<BE\
M:6YE=" @(" @(" @(" @('QN971W;W)K*&EN970I(" @"BTM+2TM*RTM+2TM
M+2TM+2TM+2LM+2TM+2TM+2TM+2TM*RTM+2TM+2TM+2TM+2TM+2TK+2TM+2TM
M+2TM+2TM+2TM+0H@(" @('PQ.3(N,38X+C$O,C1\,3DR+C$V."XQ+S(T('PQ
M.3(N,38X+C$N,C(V+S(T?#$Y,BXQ-C@N,2\R-" @(" *(" @("!\,3DR+C$V
M."XQ+S(T?#$Y,BXQ-C@N,2\R-"!\,3DR+C$V."XQ+C(R-B @('PQ.3(N,38X
M+C$N,C(V+S,R"B @(" @?#$P+S@@(" @(" @('PQ,"\X(" @(" @(" @?#$P
M+C$N,BXS+S@@(" @("!\,3 O." @(" @(" @(" @( H@(" @('PQ,"XP+C N
M,"\S,B!\,3 N,"XP+C O,S(@('PQ,"XQ+C(N,R\X(" @(" @?#$P+S@@(" @
M(" @(" @(" *(" @("!\,3 N,2XR+C,O,S(@?#$P+C$N,BXS+S,R("!\,3 N
M,2XR+C,@(" @(" @('PQ,"XQ+C(N,R\S,B @(" @"B @(" @?#$P+C$N,B\R
M-" @('PQ,"XQ+C(O,C0@(" @?#$P+C$N,BXS+S(T(" @("!\,3 N,2XR+S(T
M(" @(" @( H@(" @('PQ,"XQ+S$V(" @("!\,3 N,2\Q-B @(" @('PQ,"XQ
M+C(N,R\Q-B @(" @?#$P+C$O,38@(" @(" @(" *(" @("!\,3 O." @(" @
M(" @?#$P+S@@(" @(" @("!\,3 N,2XR+C,O." @(" @('PQ,"\X(" @(" @
M(" @(" @"B@X(')O=W,I"@I1545263H@4T5,14-4("<G(&%S(&5I9VAT+"!C
M(&%S(&-I9'(L(&UA<VML96XH8RD@87,@(FUA<VML96XH8VED<BDB+ H@(&D@
M87,@:6YE="P@;6%S:VQE;BAI*2!A<R B;6%S:VQE;BAI;F5T*2(@1E)/32!)
M3D547U1"3#L*96EG:'1\8VED<B @(" @(" @?&UA<VML96XH8VED<BE\:6YE
M=" @(" @(" @(" @('QM87-K;&5N*&EN970I"BTM+2TM*RTM+2TM+2TM+2TM
M+2LM+2TM+2TM+2TM+2TM*RTM+2TM+2TM+2TM+2TM+2TK+2TM+2TM+2TM+2TM
M+0H@(" @('PQ.3(N,38X+C$O,C1\(" @(" @(" @(" R-'PQ.3(N,38X+C$N
M,C(V+S(T?" @(" @(" @(" @,C0*(" @("!\,3DR+C$V."XQ+S(T?" @(" @
M(" @(" @,C1\,3DR+C$V."XQ+C(R-B @('P@(" @(" @(" @(#,R"B @(" @
M?#$P+S@@(" @(" @('P@(" @(" @(" @(" X?#$P+C$N,BXS+S@@(" @("!\
M(" @(" @(" @(" @. H@(" @('PQ,"XP+C N,"\S,B!\(" @(" @(" @(" S
M,GPQ,"XQ+C(N,R\X(" @(" @?" @(" @(" @(" @(#@*(" @("!\,3 N,2XR
M+C,O,S(@?" @(" @(" @(" @,S)\,3 N,2XR+C,@(" @(" @('P@(" @(" @
M(" @(#,R"B @(" @?#$P+C$N,B\R-" @('P@(" @(" @(" @(#(T?#$P+C$N
M,BXS+S(T(" @("!\(" @(" @(" @(" R- H@(" @('PQ,"XQ+S$V(" @("!\
M(" @(" @(" @(" Q-GPQ,"XQ+C(N,R\Q-B @(" @?" @(" @(" @(" @,38*
M(" @("!\,3 O." @(" @(" @?" @(" @(" @(" @(#A\,3 N,2XR+C,O." @
M(" @('P@(" @(" @(" @(" X"B@X(')O=W,I"@I1545263H@4T5,14-4("<G
M(&%S('1W;RP@8R!A<R!C:61R+"!M87-K;&5N*&,I(&%S(")M87-K;&5N*&-I
M9'(I(BP*("!I(&%S(&EN970L(&UA<VML96XH:2D@87,@(FUA<VML96XH:6YE
M="DB($923TT@24Y%5%]40DP*("!72$5212!M87-K;&5N*&,I(#P](#@["G1W
M;WQC:61R?&UA<VML96XH8VED<BE\:6YE=" @(" @('QM87-K;&5N*&EN970I
M"BTM+2LM+2TM*RTM+2TM+2TM+2TM+2TK+2TM+2TM+2TM+2LM+2TM+2TM+2TM
M+2TM"B @('PQ,"\X?" @(" @(" @(" @(#A\,3 N,2XR+C,O.'P@(" @(" @
M(" @(" X"B @('PQ,"\X?" @(" @(" @(" @(#A\,3 N,2XR+C,O.'P@(" @
M(" @(" @(" X"B@R(')O=W,I"@I1545263H@4T5,14-4("<G(&%S('-I>"P@
M8R!A<R!C:61R+"!I(&%S(&EN970@1E)/32!)3D547U1"3 H@(%=(15)%(&,@
M/2!I.PIS:7A\8VED<B @(" @(" @?&EN970@(" @(" @(" @(" *+2TM*RTM
M+2TM+2TM+2TM+2LM+2TM+2TM+2TM+2TM+2TM"B @('PQ.3(N,38X+C$O,C1\
M,3DR+C$V."XQ+C(R-B\R- H@("!\,3 O." @(" @(" @?#$P+C$N,BXS+S@@
M(" @(" *(" @?#$P+C$N,BXS+S,R('PQ,"XQ+C(N,R @(" @(" @"B @('PQ
M,"XQ+C(O,C0@("!\,3 N,2XR+C,O,C0@(" @( H@("!\,3 N,2\Q-B @(" @
M?#$P+C$N,BXS+S$V(" @(" *(" @?#$P+S@@(" @(" @('PQ,"XQ+C(N,R\X
1(" @(" @"B@V(')O=W,I"@H*
`
end

#2Noname
darcy@druid.net
In reply to: Andreas Zeugswetter (#1)
Re: [HACKERS] Bug in current network.c

Thus spake Andreas Zeugswetter

a - 1506-068 (S) Operation between types "char*" and "int" is not allowed.
gmake[3]: *** [network.o] Error 1

It should probably read as follows: (but please check)
(I sure hope it comes without those stupid wraps my mailer always
generates)

For some reason network.c reverted to an earlier version in the tree. Your
patch was already submitted by someone (Bruce?) but the changes, like my
other changes, were lost. I assume that your patch is correct but the
person who submitted the previous patch should double check that nothing
else is missing.

-- 
D'Arcy J.M. Cain <darcy@{druid|vex}.net>   |  Democracy is three wolves
http://www.druid.net/darcy/                |  and a sheep voting on
+1 416 424 2871     (DoD#0082)    (eNTP)   |  what's for dinner.
#3Tom Lane
tgl@sss.pgh.pa.us
In reply to: Noname (#2)
Re: [HACKERS] Bug in current network.c

darcy@druid.net (D'Arcy J.M. Cain) writes:

For some reason network.c reverted to an earlier version in the tree. Your
patch was already submitted by someone (Bruce?) but the changes, like my
other changes, were lost.

It looks like Bruce copied-and-pasted a little too much while applying
your last patch. I had fixed the "< 0" tests that ought to be "== NULL"
on Sunday, but one of them was on a line that you wanted changed for other
reasons, and it went back to being wrong...

Fixed now.

regards, tom lane

#4Noname
darcy@druid.net
In reply to: Tom Lane (#3)
Re: [HACKERS] Bug in current network.c

Thus spake Tom Lane

darcy@druid.net (D'Arcy J.M. Cain) writes:

For some reason network.c reverted to an earlier version in the tree. Your
patch was already submitted by someone (Bruce?) but the changes, like my
other changes, were lost.

It looks like Bruce copied-and-pasted a little too much while applying
your last patch. I had fixed the "< 0" tests that ought to be "== NULL"
on Sunday, but one of them was on a line that you wanted changed for other
reasons, and it went back to being wrong...

Trust us. We're professionals. :-)

-- 
D'Arcy J.M. Cain <darcy@{druid|vex}.net>   |  Democracy is three wolves
http://www.druid.net/darcy/                |  and a sheep voting on
+1 416 424 2871     (DoD#0082)    (eNTP)   |  what's for dinner.