Skip to content

P
Postgres FD Implementation
Commit ad177f10 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Source code cleanup.

parent e7a9ccdb
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
src/backend/utils/adt/network.c
View file @ ad177f10
/* /*
* PostgreSQL type definitions for the INET and CIDR types. * PostgreSQL type definitions for the INET and CIDR types.
* *
* $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.62 2006/01/26 18:08:10 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.63 2006/02/07 17:04:04 momjian Exp $
* *
* Jon Postel RIP 16 Oct 1998 * Jon Postel RIP 16 Oct 1998
*/ */
...@@ -104,9 +104,9 @@ network_in(char *src, bool is_cidr) ...@@ -104,9 +104,9 @@ network_in(char *src, bool is_cidr)
errdetail("Value has bits set to right of mask."))); errdetail("Value has bits set to right of mask.")));
} }
VARATT_SIZEP(dst) = VARHDRSZ VARATT_SIZEP(dst) = VARHDRSZ +
+ ((char *) ip_addr(dst) - (char *) VARDATA(dst)) ((char *) ip_addr(dst) - (char *) VARDATA(dst)) +
+ ip_addrsize(dst); ip_addrsize(dst);
ip_bits(dst) = bits; ip_bits(dst) = bits;
return dst; return dst;
...@@ -219,9 +219,9 @@ network_recv(StringInfo buf, bool is_cidr) ...@@ -219,9 +219,9 @@ network_recv(StringInfo buf, bool is_cidr)
/* translator: %s is inet or cidr */ /* translator: %s is inet or cidr */
errmsg("invalid length in external \"%s\" value", errmsg("invalid length in external \"%s\" value",
is_cidr ? "cidr" : "inet"))); is_cidr ? "cidr" : "inet")));
VARATT_SIZEP(addr) = VARHDRSZ VARATT_SIZEP(addr) = VARHDRSZ +
+ ((char *) ip_addr(addr) - (char *) VARDATA(addr)) ((char *) ip_addr(addr) - (char *) VARDATA(addr)) +
+ ip_addrsize(addr); ip_addrsize(addr);
addrptr = (char *) ip_addr(addr); addrptr = (char *) ip_addr(addr);
for (i = 0; i < nb; i++) for (i = 0; i < nb; i++)
...@@ -792,9 +792,9 @@ network_broadcast(PG_FUNCTION_ARGS) ...@@ -792,9 +792,9 @@ network_broadcast(PG_FUNCTION_ARGS)
ip_family(dst) = ip_family(ip); ip_family(dst) = ip_family(ip);
ip_bits(dst) = ip_bits(ip); ip_bits(dst) = ip_bits(ip);
VARATT_SIZEP(dst) = VARHDRSZ VARATT_SIZEP(dst) = VARHDRSZ +
+ ((char *) ip_addr(dst) - (char *) VARDATA(dst)) ((char *) ip_addr(dst) - (char *) VARDATA(dst)) +
+ ip_addrsize(dst); ip_addrsize(dst);
PG_RETURN_INET_P(dst); PG_RETURN_INET_P(dst);
} }
...@@ -837,9 +837,9 @@ network_network(PG_FUNCTION_ARGS) ...@@ -837,9 +837,9 @@ network_network(PG_FUNCTION_ARGS)
ip_family(dst) = ip_family(ip); ip_family(dst) = ip_family(ip);
ip_bits(dst) = ip_bits(ip); ip_bits(dst) = ip_bits(ip);
VARATT_SIZEP(dst) = VARHDRSZ VARATT_SIZEP(dst) = VARHDRSZ +
+ ((char *) ip_addr(dst) - (char *) VARDATA(dst)) ((char *) ip_addr(dst) - (char *) VARDATA(dst)) +
+ ip_addrsize(dst); ip_addrsize(dst);
PG_RETURN_INET_P(dst); PG_RETURN_INET_P(dst);
} }
...@@ -880,9 +880,9 @@ network_netmask(PG_FUNCTION_ARGS) ...@@ -880,9 +880,9 @@ network_netmask(PG_FUNCTION_ARGS)
ip_family(dst) = ip_family(ip); ip_family(dst) = ip_family(ip);
ip_bits(dst) = ip_maxbits(ip); ip_bits(dst) = ip_maxbits(ip);
VARATT_SIZEP(dst) = VARHDRSZ VARATT_SIZEP(dst) = VARHDRSZ +
+ ((char *) ip_addr(dst) - (char *) VARDATA(dst)) ((char *) ip_addr(dst) - (char *) VARDATA(dst)) +
+ ip_addrsize(dst); ip_addrsize(dst);
PG_RETURN_INET_P(dst); PG_RETURN_INET_P(dst);
} }
...@@ -929,9 +929,9 @@ network_hostmask(PG_FUNCTION_ARGS) ...@@ -929,9 +929,9 @@ network_hostmask(PG_FUNCTION_ARGS)
ip_family(dst) = ip_family(ip); ip_family(dst) = ip_family(ip);
ip_bits(dst) = ip_maxbits(ip); ip_bits(dst) = ip_maxbits(ip);
VARATT_SIZEP(dst) = VARHDRSZ VARATT_SIZEP(dst) = VARHDRSZ +
+ ((char *) ip_addr(dst) - (char *) VARDATA(dst)) ((char *) ip_addr(dst) - (char *) VARDATA(dst)) +
+ ip_addrsize(dst); ip_addrsize(dst);
PG_RETURN_INET_P(dst); PG_RETURN_INET_P(dst);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment