aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/network.c
diff options
context:
space:
mode:
authorJan Wieck <JanWieck@Yahoo.com>2000-07-03 23:10:14 +0000
committerJan Wieck <JanWieck@Yahoo.com>2000-07-03 23:10:14 +0000
commit57d8080a40f51e1ff9eedea602e96e2612161d77 (patch)
tree6dbed1f7333436cb08af6e7c0d9c55ac5e064750 /src/backend/utils/adt/network.c
parentef5bea51e17d36ab06e7e67847a8b1e489d6d189 (diff)
downloadpostgresql-57d8080a40f51e1ff9eedea602e96e2612161d77.tar.gz
postgresql-57d8080a40f51e1ff9eedea602e96e2612161d77.zip
TOAST
WARNING: This is actually broken - we have self-deadlocks due to concurrent changes in buffer management. Vadim and me are working on it. Jan
Diffstat (limited to 'src/backend/utils/adt/network.c')
-rw-r--r--src/backend/utils/adt/network.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 7e1a9ead666..a5127ece26f 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
* is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate.
*
- * $Id: network.c,v 1.21 2000/04/12 17:15:50 momjian Exp $
+ * $Id: network.c,v 1.22 2000/07/03 23:09:52 wieck Exp $
* Jon Postel RIP 16 Oct 1998
*/
@@ -61,7 +61,7 @@ network_in(char *src, int type)
/* Go for an IPV6 address here, before faulting out: */
elog(ERROR, "could not parse \"%s\"", src);
- VARSIZE(dst) = VARHDRSZ
+ VARATT_SIZEP(dst) = VARHDRSZ
+ ((char *) &ip_v4addr(dst) - (char *) VARDATA(dst))
+ ip_addrsize(dst);
ip_bits(dst) = bits;
@@ -346,7 +346,7 @@ network_host(inet *ip)
if (ret == NULL)
elog(ERROR, "unable to allocate memory in network_host()");
- VARSIZE(ret) = len;
+ VARATT_SIZEP(ret) = len;
strcpy(VARDATA(ret), tmp);
return (ret);
}
@@ -396,7 +396,7 @@ network_broadcast(inet *ip)
if (ret == NULL)
elog(ERROR, "unable to allocate memory in network_broadcast()");
- VARSIZE(ret) = len;
+ VARATT_SIZEP(ret) = len;
strcpy(VARDATA(ret), tmp);
return (ret);
}
@@ -429,7 +429,7 @@ network_network(inet *ip)
if (ret == NULL)
elog(ERROR, "unable to allocate memory in network_network()");
- VARSIZE(ret) = len;
+ VARATT_SIZEP(ret) = len;
strcpy(VARDATA(ret), tmp);
return (ret);
}
@@ -466,7 +466,7 @@ network_netmask(inet *ip)
if (ret == NULL)
elog(ERROR, "unable to allocate memory in network_netmask()");
- VARSIZE(ret) = len;
+ VARATT_SIZEP(ret) = len;
strcpy(VARDATA(ret), tmp);
return (ret);
}