[hurd] 02/75: libtrivfs: remove deprecated static class vectors

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit 7dd0f755f4ac29e6c10085c16e18dd97d92ae5e7
Author: Justus Winter <address@hidden>
Date:   Sun Nov 1 12:34:36 2015 +0100

    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(-)

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.
 
address@hidden {extern struct port_class *} trivfs_protid_portclasses []
address@hidden {extern int} trivfs_protid_nportclasses
address@hidden {extern struct port_class *} trivfs_cntl_portclasses []
address@hidden {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
address@hidden (or @code{trivfs_startup}), which will
-automatically be recognized.
address@hidden deftypevar
-
 @deftypefn {Variable} error_t {(*trivfs_check_open_hook)} (@w{struct 
trivfs_control address@hidden, @w{struct iouser address@hidden, @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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git