Skip to content

Commit 2925114

Browse files
bmomjianbmomjian
committed
try again
1 parent 92da1c3 commit 2925114

File tree

15 files changed

+1892
-173
lines changed

15 files changed

+1892
-173
lines changed

‎contrib/ip_and_mac/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL types for IP and MAC addresses
33
#
4-
# $Id: Makefile,v 1.4 1998/06/16 04:34:29 momjian Exp $
4+
# $Id: Makefile,v 1.5 1998/06/16 05:35:10 momjian Exp $
55

66
all: ip.so mac.so
77

@@ -18,7 +18,7 @@ mac.o: mac.c mac.h
1818
cc -g -O -fPIC -I/usr/local/pgsql/include -c mac.c
1919

2020
install: ip.so mac.so
21-
install -c ip.so mac.so /usr/local/pgsql/modules
21+
install -c ip.so mac.so /usr/local/pgsql/contrib/ip_and_macs
2222

2323
clean:
2424
rm -f *.o *.so *.b

‎contrib/ip_and_mac/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ written by (Bergen, Norway, 1998-01-31, Tom Ivar Helbekkmo
55
rewritten by me (alex@relcom.EU.net, Aleksei Roudnev, Moscow, Russia,
66
25.05.98) and written first by Bergen.
77

8-
To see the description of macaddr type, read README.ORIG file.
9-
To see the description of ipaddr type, read ipaddr.html file.
8+
To see the description of macaddr type, read README.ORIG file. To see
9+
the description of ipaddr type, read ipaddr.html file.
1010
^^^^^^^^^^^
1111

1212
This ipaddr type differ slightly from the original one. First, if you

‎contrib/ip_and_mac/README.ORIG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL type extensions for IP and MAC addresses.
22
---------------------------------------------------
33

4-
$Id: README.ORIG,v 1.1 1998/06/16 04:34:29 momjian Exp $
4+
$Id: README.ORIG,v 1.2 1998/06/16 05:35:10 momjian Exp $
55

66
I needed to record IP and MAC level ethernet addresses in a data
77
base, and I really didn't want to store them as plain strings, with

‎contrib/ip_and_mac/ip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* PostgreSQL type definitions for IP addresses.
33
*
4-
* $Id: ip.c,v 1.4 1998/06/16 04:34:29 momjian Exp $
4+
* $Id: ip.c,v 1.5 1998/06/16 05:35:10 momjian Exp $
55
*/
66

77
#include <stdio.h>

‎contrib/ip_and_mac/ip.sql

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--
22
-- PostgreSQL code for IP addresses.
33
--
4-
-- $Id: ip.sql,v 1.4 1998/06/16 04:34:30 momjian Exp $
4+
-- $Id: ip.sql,v 1.5 1998/06/16 05:35:10 momjian Exp $
55
-- Invoced from 1998/02/14 17:58:04 scrappy
66
--
77
-- New - INPUT/OUTPUT, functions, indexing by btree, test.
88
-- PART # 1 - ip.sql - load new type, functions and operators.
99
-- Then you should execute ipi.sql - add ipaddr_ops class to allow indexing.
1010

11-
load '/usr/local/pgsql/modules/ip.so';
11+
load '/usr/local/pgsql/contrib/ip_and_macs/ip.so';
1212

1313
--
1414
-- Input and output functions and the type itself:
@@ -20,14 +20,14 @@ load '/usr/local/pgsql/modules/ip.so';
2020

2121
create function ipaddr_in(opaque)
2222
returns opaque
23-
as '/usr/local/pgsql/modules/ip.so'
23+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
2424
language 'c';
2525

2626

2727

2828
create function ipaddr_out(opaque)
2929
returns opaque
30-
as '/usr/local/pgsql/modules/ip.so'
30+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
3131
language 'c';
3232

3333
create type ipaddr (
@@ -46,7 +46,7 @@ create type ipaddr (
4646
drop function ipaddr_print;
4747
create function ipaddr_print(ipaddr, text)
4848
returns text
49-
as '/usr/local/pgsql/modules/ip.so'
49+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
5050
language 'c';
5151
);
5252

@@ -58,32 +58,32 @@ create function ipaddr_print(ipaddr, text)
5858

5959
create function ipaddr_lt(ipaddr, ipaddr)
6060
returns bool
61-
as '/usr/local/pgsql/modules/ip.so'
61+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
6262
language 'c';
6363

6464
create function ipaddr_le(ipaddr, ipaddr)
6565
returns bool
66-
as '/usr/local/pgsql/modules/ip.so'
66+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
6767
language 'c';
6868

6969
create function ipaddr_eq(ipaddr, ipaddr)
7070
returns bool
71-
as '/usr/local/pgsql/modules/ip.so'
71+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
7272
language 'c';
7373

7474
create function ipaddr_ge(ipaddr, ipaddr)
7575
returns bool
76-
as '/usr/local/pgsql/modules/ip.so'
76+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
7777
language 'c';
7878

7979
create function ipaddr_gt(ipaddr, ipaddr)
8080
returns bool
81-
as '/usr/local/pgsql/modules/ip.so'
81+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
8282
language 'c';
8383

8484
create function ipaddr_ne(ipaddr, ipaddr)
8585
returns bool
86-
as '/usr/local/pgsql/modules/ip.so'
86+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
8787
language 'c';
8888

8989
--
@@ -92,7 +92,7 @@ create function ipaddr_ne(ipaddr, ipaddr)
9292
--
9393
create function ipaddr_in_net(ipaddr, ipaddr)
9494
returns bool
95-
as '/usr/local/pgsql/modules/ip.so'
95+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
9696
language 'c';
9797

9898
--
@@ -104,7 +104,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
104104

105105
create function ipaddr_net(ipaddr)
106106
returns ipaddr
107-
as '/usr/local/pgsql/modules/ip.so'
107+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
108108
language 'c';
109109

110110
--
@@ -114,7 +114,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
114114

115115
create function ipaddr_is_net(ipaddr)
116116
returns boolean
117-
as '/usr/local/pgsql/modules/ip.so'
117+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
118118
language 'c';
119119

120120
--
@@ -123,7 +123,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
123123

124124
create function ipaddr_len(ipaddr)
125125
returns int4
126-
as '/usr/local/pgsql/modules/ip.so'
126+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
127127
language 'c';
128128

129129
--
@@ -132,7 +132,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
132132

133133
create function ipaddr_pref(ipaddr)
134134
returns int4
135-
as '/usr/local/pgsql/modules/ip.so'
135+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
136136
language 'c';
137137

138138
--
@@ -142,7 +142,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
142142

143143
create function ipaddr_integer(ipaddr)
144144
returns int4
145-
as '/usr/local/pgsql/modules/ip.so'
145+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
146146
language 'c';
147147

148148
--
@@ -152,7 +152,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
152152

153153
create function ipaddr_compose(int4,int4)
154154
returns ipaddr
155-
as '/usr/local/pgsql/modules/ip.so'
155+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
156156
language 'c';
157157

158158
--
@@ -161,7 +161,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
161161

162162
create function ipaddr_mask(ipaddr)
163163
returns ipaddr
164-
as '/usr/local/pgsql/modules/ip.so'
164+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
165165
language 'c';
166166

167167
--
@@ -170,7 +170,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
170170

171171
create function ipaddr_bcast(ipaddr)
172172
returns ipaddr
173-
as '/usr/local/pgsql/modules/ip.so'
173+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
174174
language 'c';
175175

176176
--
@@ -180,7 +180,7 @@ create function ipaddr_in_net(ipaddr, ipaddr)
180180

181181
create function ipaddr_cmp(ipaddr,ipaddr)
182182
returns int4
183-
as '/usr/local/pgsql/modules/ip.so'
183+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
184184
language 'c';
185185

186186
--
@@ -189,12 +189,12 @@ create function ipaddr_in_net(ipaddr, ipaddr)
189189

190190
create function ipaddr_plus(ipaddr,int4)
191191
returns ipaddr
192-
as '/usr/local/pgsql/modules/ip.so'
192+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
193193
language 'c';
194194

195195
create function ipaddr_minus(ipaddr,int4)
196196
returns ipaddr
197-
as '/usr/local/pgsql/modules/ip.so'
197+
as '/usr/local/pgsql/contrib/ip_and_macs/ip.so'
198198
language 'c';
199199

200200
--

‎contrib/ip_and_mac/ip.sql.in

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)