|
1 | 1 | /* |
2 | 2 | * PostgreSQL type definitions for the INET and CIDR types. |
3 | 3 | * |
4 | | - * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.62 2006/01/26 18:08:10 tgl Exp $ |
| 4 | + * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.63 2006/02/07 17:04:04 momjian Exp $ |
5 | 5 | * |
6 | 6 | * Jon Postel RIP 16 Oct 1998 |
7 | 7 | */ |
@@ -104,9 +104,9 @@ network_in(char *src, bool is_cidr) |
104 | 104 | errdetail("Value has bits set to right of mask."))); |
105 | 105 | } |
106 | 106 |
|
107 | | - VARATT_SIZEP(dst) = VARHDRSZ |
108 | | - + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) |
109 | | - + ip_addrsize(dst); |
| 107 | + VARATT_SIZEP(dst) = VARHDRSZ + |
| 108 | + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) + |
| 109 | + ip_addrsize(dst); |
110 | 110 | ip_bits(dst) = bits; |
111 | 111 |
|
112 | 112 | return dst; |
@@ -219,9 +219,9 @@ network_recv(StringInfo buf, bool is_cidr) |
219 | 219 | /* translator: %s is inet or cidr */ |
220 | 220 | errmsg("invalid length in external \"%s\" value", |
221 | 221 | is_cidr ? "cidr" : "inet"))); |
222 | | - VARATT_SIZEP(addr) = VARHDRSZ |
223 | | - + ((char *) ip_addr(addr) - (char *) VARDATA(addr)) |
224 | | - + ip_addrsize(addr); |
| 222 | + VARATT_SIZEP(addr) = VARHDRSZ + |
| 223 | + ((char *) ip_addr(addr) - (char *) VARDATA(addr)) + |
| 224 | + ip_addrsize(addr); |
225 | 225 |
|
226 | 226 | addrptr = (char *) ip_addr(addr); |
227 | 227 | for (i = 0; i < nb; i++) |
@@ -792,9 +792,9 @@ network_broadcast(PG_FUNCTION_ARGS) |
792 | 792 |
|
793 | 793 | ip_family(dst) = ip_family(ip); |
794 | 794 | ip_bits(dst) = ip_bits(ip); |
795 | | - VARATT_SIZEP(dst) = VARHDRSZ |
796 | | - + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) |
797 | | - + ip_addrsize(dst); |
| 795 | + VARATT_SIZEP(dst) = VARHDRSZ + |
| 796 | + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) + |
| 797 | + ip_addrsize(dst); |
798 | 798 |
|
799 | 799 | PG_RETURN_INET_P(dst); |
800 | 800 | } |
@@ -837,9 +837,9 @@ network_network(PG_FUNCTION_ARGS) |
837 | 837 |
|
838 | 838 | ip_family(dst) = ip_family(ip); |
839 | 839 | ip_bits(dst) = ip_bits(ip); |
840 | | - VARATT_SIZEP(dst) = VARHDRSZ |
841 | | - + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) |
842 | | - + ip_addrsize(dst); |
| 840 | + VARATT_SIZEP(dst) = VARHDRSZ + |
| 841 | + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) + |
| 842 | + ip_addrsize(dst); |
843 | 843 |
|
844 | 844 | PG_RETURN_INET_P(dst); |
845 | 845 | } |
@@ -880,9 +880,9 @@ network_netmask(PG_FUNCTION_ARGS) |
880 | 880 |
|
881 | 881 | ip_family(dst) = ip_family(ip); |
882 | 882 | ip_bits(dst) = ip_maxbits(ip); |
883 | | - VARATT_SIZEP(dst) = VARHDRSZ |
884 | | - + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) |
885 | | - + ip_addrsize(dst); |
| 883 | + VARATT_SIZEP(dst) = VARHDRSZ + |
| 884 | + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) + |
| 885 | + ip_addrsize(dst); |
886 | 886 |
|
887 | 887 | PG_RETURN_INET_P(dst); |
888 | 888 | } |
@@ -929,9 +929,9 @@ network_hostmask(PG_FUNCTION_ARGS) |
929 | 929 |
|
930 | 930 | ip_family(dst) = ip_family(ip); |
931 | 931 | ip_bits(dst) = ip_maxbits(ip); |
932 | | - VARATT_SIZEP(dst) = VARHDRSZ |
933 | | - + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) |
934 | | - + ip_addrsize(dst); |
| 932 | + VARATT_SIZEP(dst) = VARHDRSZ + |
| 933 | + ((char *) ip_addr(dst) - (char *) VARDATA(dst)) + |
| 934 | + ip_addrsize(dst); |
935 | 935 |
|
936 | 936 | PG_RETURN_INET_P(dst); |
937 | 937 | } |
|
0 commit comments