- itojun@cvs.openbsd.org 2001/06/26 06:32:58

     [atomicio.h authfd.h authfile.h auth.h auth-options.h bufaux.h
      buffer.h canohost.h channels.h cipher.h clientloop.h compat.h
      compress.h crc32.h deattack.h dh.h dispatch.h groupaccess.h
      hostfile.h kex.h key.h log.h mac.h match.h misc.h mpaux.h packet.h
      radix.h readconf.h readpass.h rsa.h]
     prototype pedant.  not very creative...
     - () -> (void)
     - no variable names

1 files changed, 47 insertions, 56 deletions

diff --git a/channels.h b/channels.h
index 0ce8372bd..3a114e070 100644
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.40 2001/06/25 08:25:36 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.41 2001/06/26 06:32:49 itojun Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -65,8 +65,8 @@
 struct Channel;
 typedef struct Channel Channel;
 
-typedef void channel_callback_fn(int id, void *arg);
-typedef int channel_filter_fn(struct Channel *c, char *buf, int len);
+typedef void channel_callback_fn(int, void *);
+typedef int channel_filter_fn(struct Channel *, char *, int);
 
 struct Channel {
         int     type;           /* channel type/state */
@@ -142,44 +142,39 @@ struct Channel {
 
 /* channel management */
 
-Channel *channel_lookup(int id);
-Channel *
-channel_new(char *ctype, int type, int rfd, int wfd, int efd,
-    int window, int maxpack, int extusage, char *remote_name, int nonblock);
-void
-channel_set_fds(int id, int rfd, int wfd, int efd,
-    int extusage, int nonblock);
-void    channel_free(Channel *c);
+Channel *channel_lookup(int);
+Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
+void    channel_set_fds(int, int, int, int, int, int);
+void    channel_free(Channel *);
 void    channel_free_all(void);
 
-void    channel_send_open(int id);
-void    channel_request(int id, char *service, int wantconfirm);
-void    channel_request_start(int id, char *service, int wantconfirm);
-void    channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg);
-void    channel_register_cleanup(int id, channel_callback_fn *fn);
-void    channel_register_filter(int id, channel_filter_fn *fn);
-void    channel_cancel_cleanup(int id);
+void    channel_send_open(int);
+void    channel_request(int, char *, int);
+void    channel_request_start(int, char *, int);
+void    channel_register_callback(int, int mtype, channel_callback_fn *, void *);
+void    channel_register_cleanup(int, channel_callback_fn *);
+void    channel_register_filter(int, channel_filter_fn *);
+void    channel_cancel_cleanup(int);
 
 /* protocol handler */
 
-void    channel_input_channel_request(int type, int plen, void *ctxt);
-void    channel_input_close(int type, int plen, void *ctxt);
-void    channel_input_close_confirmation(int type, int plen, void *ctxt);
-void    channel_input_data(int type, int plen, void *ctxt);
-void    channel_input_extended_data(int type, int plen, void *ctxt);
-void    channel_input_ieof(int type, int plen, void *ctxt);
-void    channel_input_oclose(int type, int plen, void *ctxt);
-void    channel_input_open_confirmation(int type, int plen, void *ctxt);
-void    channel_input_open_failure(int type, int plen, void *ctxt);
-void    channel_input_port_open(int type, int plen, void *ctxt);
-void    channel_input_window_adjust(int type, int plen, void *ctxt);
+void    channel_input_channel_request(int, int, void *);
+void    channel_input_close(int, int, void *);
+void    channel_input_close_confirmation(int, int, void *);
+void    channel_input_data(int, int, void *);
+void    channel_input_extended_data(int, int, void *);
+void    channel_input_ieof(int, int, void *);
+void    channel_input_oclose(int, int, void *);
+void    channel_input_open_confirmation(int, int, void *);
+void    channel_input_open_failure(int, int, void *);
+void    channel_input_port_open(int, int, void *);
+void    channel_input_window_adjust(int, int, void *);
 
 /* file descriptor handling (read/write) */
 
 void
-channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
-    int rekeying);
-void    channel_after_select(fd_set * readset, fd_set * writeset);
+channel_prepare_select(fd_set **, fd_set **, int *, int);
+void    channel_after_select(fd_set *, fd_set *);
 void    channel_output_poll(void);
 
 int     channel_not_very_much_buffered_data(void);
@@ -191,45 +186,41 @@ int	channel_find_open(void);
 
 /* channel_tcpfwd.c */
 int
-channel_request_local_forwarding(u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports);
+channel_request_local_forwarding(u_short, const char *, u_short, int);
 int
-channel_request_forwarding(const char *listen_address, u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports,
-    int remote_fwd);
+channel_request_forwarding(const char *, u_short, const char *, u_short, int,
+    int);
 void
-channel_request_remote_forwarding(u_short port, const char *host,
-    u_short remote_port);
+channel_request_remote_forwarding(u_short, const char *, u_short);
 void    channel_permit_all_opens(void);
-void    channel_add_permitted_opens(char *host, int port);
+void    channel_add_permitted_opens(char *, int);
 void    channel_clear_permitted_opens(void);
-void    channel_input_port_forward_request(int is_root, int gateway_ports);
-int     channel_connect_to(const char *host, u_short host_port);
-int     channel_connect_by_listen_adress(u_short listen_port);
+void    channel_input_port_forward_request(int, int);
+int     channel_connect_to(const char *, u_short);
+int     channel_connect_by_listen_adress(u_short);
 
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-char   *x11_create_display(int screen);
-char   *x11_create_display_inet(int screen, int x11_display_offset);
-void    x11_input_open(int type, int plen, void *ctxt);
+char   *x11_create_display(int);
+char   *x11_create_display_inet(int, int);
+void    x11_input_open(int, int, void *);
 void    x11_request_forwarding(void);
 void
-x11_request_forwarding_with_spoofing(int client_session_id,
-    const char *proto, const char *data);
-void    deny_input_open(int type, int plen, void *ctxt);
+x11_request_forwarding_with_spoofing(int, const char *, const char *);
+void    deny_input_open(int, int, void *);
 
 /* agent forwarding */
 
 void    auth_request_forwarding(void);
 char   *auth_get_socket_name(void);
-void    auth_sock_cleanup_proc(void *pw);
-int     auth_input_request_forwarding(struct passwd * pw);
-void    auth_input_open_request(int type, int plen, void *ctxt);
+void    auth_sock_cleanup_proc(void *);
+int     auth_input_request_forwarding(struct passwd *);
+void    auth_input_open_request(int, int, void *);
 
 /* channel close */
 
-typedef void    chan_event_fn(Channel * c);
+typedef void    chan_event_fn(Channel *);
 
 /* for the input state */
 extern chan_event_fn    *chan_rcvd_oclose;
@@ -241,9 +232,9 @@ extern chan_event_fn	*chan_rcvd_ieof;
 extern chan_event_fn    *chan_write_failed;
 extern chan_event_fn    *chan_obuf_empty;
 
-int     chan_is_dead(Channel * c);
-void    chan_mark_dead(Channel * c);
-void    chan_init_iostates(Channel * c);
+int     chan_is_dead(Channel *);
+void    chan_mark_dead(Channel *);
+void    chan_init_iostates(Channel *);
 void    chan_init(void);
 
 #endif