1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
From 00df5da7e57261c72d09ba8abb2e44e87d36b970 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sun, 1 Nov 2015 12:34:36 +0100
Subject: [PATCH hurd] libtrivfs: remove deprecated static class vectors
This API has been deprecated in Hurd 0.7.
* doc/hurd.texi (trivfs_protid_portclasses,
trivfs_protid_nportclasses, trivfs_cntl_portclasses,
trivfs_cntl_nportclasses): Remove.
* libtrivfs/trivfs.h: Likewise.
* libtrivfs/mig-decls.h: Adapt accordingly.
* libtrivfs/cntl-classes.c: Remove unused file.
* libtrivfs/protid-classes.c: Likewise.
* libtrivfs/Makefile (OTHERSRCS): Drop the two files.
---
doc/hurd.texi | 11 -----------
libtrivfs/Makefile | 1 -
libtrivfs/cntl-classes.c | 22 ----------------------
libtrivfs/mig-decls.h | 12 ------------
libtrivfs/protid-classes.c | 22 ----------------------
libtrivfs/trivfs.h | 13 -------------
6 files changed, 81 deletions(-)
delete mode 100644 libtrivfs/cntl-classes.c
delete mode 100644 libtrivfs/protid-classes.c
diff --git a/doc/hurd.texi b/doc/hurd.texi
index 21a7895..23c5c8a 100644
--- a/doc/hurd.texi
+++ b/doc/hurd.texi
@@ -2318,17 +2318,6 @@ The functions and variables described in this subsection already have
default definitions in @code{libtrivfs}, so you are not forced to define
them; rather, they may be redefined on a case-by-case basis.
-@deftypevar {extern struct port_class *} trivfs_protid_portclasses []
-@deftypevarx {extern int} trivfs_protid_nportclasses
-@deftypevarx {extern struct port_class *} trivfs_cntl_portclasses []
-@deftypevarx {extern int} trivfs_cntl_nportclasses
-If you define these, they should be vectors (and the associated sizes)
-of port classes that will be translated into control and protid pointers
-for passing to RPCs, in addition to those passed to or created by
-@code{trivfs_create_control} (or @code{trivfs_startup}), which will
-automatically be recognized.
-@end deftypevar
-
@deftypefn {Variable} error_t {(*trivfs_check_open_hook)} (@w{struct trivfs_control *@var{cntl}}, @w{struct iouser *@var{user}}, @w{int @var{flags}})
If this variable is non-zero, it will be called every time an open happens.
@var{user} and @var{flags} are from the open; @var{cntl} identifies the
diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile
index 48a53d7..4f9c71f 100644
--- a/libtrivfs/Makefile
+++ b/libtrivfs/Makefile
@@ -40,7 +40,6 @@ FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-stubs.c fsys-syncfs.c \
OTHERSRCS=demuxer.c protid-clean.c protid-dup.c cntl-create.c \
cntl-clean.c times.c startup.c open.c \
runtime-argp.c set-options.c append-args.c dyn-classes.c \
- protid-classes.c cntl-classes.c
SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(OTHERSRCS)
diff --git a/libtrivfs/cntl-classes.c b/libtrivfs/cntl-classes.c
deleted file mode 100644
index 356c9e9..0000000
--- a/libtrivfs/cntl-classes.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Defaults for TRIVFS_CNTL_[N]PORTCLASSES
-
- Copyright (C) 1997 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#include "trivfs.h"
-
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_cntl_nportclasses;
diff --git a/libtrivfs/mig-decls.h b/libtrivfs/mig-decls.h
index 1909199..230af23 100644
--- a/libtrivfs/mig-decls.h
+++ b/libtrivfs/mig-decls.h
@@ -45,9 +45,6 @@ trivfs_begin_using_protid (mach_port_t port)
for (i = 0; i < trivfs_num_dynamic_protid_port_classes; i++)
if (pi->class == trivfs_dynamic_protid_port_classes[i])
return (struct trivfs_protid *) pi;
- for (i = 0; i < trivfs_protid_nportclasses; i++)
- if (pi->class == trivfs_protid_portclasses[i])
- return (struct trivfs_protid *) pi;
ports_port_deref (pi);
}
@@ -65,9 +62,6 @@ trivfs_begin_using_protid_payload (unsigned long payload)
for (i = 0; i < trivfs_num_dynamic_protid_port_classes; i++)
if (pi->class == trivfs_dynamic_protid_port_classes[i])
return (struct trivfs_protid *) pi;
- for (i = 0; i < trivfs_protid_nportclasses; i++)
- if (pi->class == trivfs_protid_portclasses[i])
- return (struct trivfs_protid *) pi;
ports_port_deref (pi);
}
@@ -92,9 +86,6 @@ trivfs_begin_using_control (mach_port_t port)
for (i = 0; i < trivfs_num_dynamic_control_port_classes; i++)
if (pi->class == trivfs_dynamic_control_port_classes[i])
return (struct trivfs_control *) pi;
- for (i = 0; i < trivfs_cntl_nportclasses; i++)
- if (pi->class == trivfs_cntl_portclasses[i])
- return (struct trivfs_control *) pi;
ports_port_deref (pi);
}
@@ -112,9 +103,6 @@ trivfs_begin_using_control_payload (unsigned long payload)
for (i = 0; i < trivfs_num_dynamic_control_port_classes; i++)
if (pi->class == trivfs_dynamic_control_port_classes[i])
return (struct trivfs_control *) pi;
- for (i = 0; i < trivfs_cntl_nportclasses; i++)
- if (pi->class == trivfs_cntl_portclasses[i])
- return (struct trivfs_control *) pi;
ports_port_deref (pi);
}
diff --git a/libtrivfs/protid-classes.c b/libtrivfs/protid-classes.c
deleted file mode 100644
index 204548d..0000000
--- a/libtrivfs/protid-classes.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Defaults for TRIVFS_PROTID_[N]PORTCLASSES
-
- Copyright (C) 1997 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#include "trivfs.h"
-
-struct port_class *trivfs_protid_portclasses[1];
-int trivfs_protid_nportclasses;
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
index d620a7b..d81c4f9 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -74,19 +74,6 @@ extern int trivfs_support_exec;
operations.) */
extern int trivfs_allow_open;
-/* If the user defines these, they should be vectors (and the associated
- sizes) of port classes that will be translated into control & protid
- pointers for passing to rpcs, in addition to those passed to or created by
- trivfs_create_control (or trivfs_startup) will automatically be
- recognized. */
-/* Deprecation notice: The use of these vectors is deprecated. Please
- use the dynamic class support. These vectors will be removed in
- Hurd 0.8. */
-extern struct port_class *trivfs_protid_portclasses[] __attribute__ ((deprecated));
-extern int trivfs_protid_nportclasses __attribute__ ((deprecated));
-extern struct port_class *trivfs_cntl_portclasses[] __attribute__ ((deprecated));
-extern int trivfs_cntl_nportclasses __attribute__ ((deprecated));
-
/* The user must define this function. This should modify a struct
stat (as returned from the underlying node) for presentation to
callers of io_stat. It is permissible for this function to do
--
2.1.4
|
