From 0dd751c6e954a7a8f87bdda9af181530f97c94cc Mon Sep 17 00:00:00 2001 From: adilger Date: Thu, 5 Jun 2003 23:57:13 +0000 Subject: [PATCH] Quiet compiler warnings in portals. Basically, just pass void parameters to match the function pointer declarations and cast back to the original type inside the function. --- lnet/ulnds/connection.c | 7 ++++--- lnet/ulnds/connection.h | 12 +++--------- lnet/ulnds/socklnd/connection.c | 7 ++++--- lnet/ulnds/socklnd/connection.h | 12 +++--------- lnet/ulnds/socklnd/tcplnd.c | 18 ++++++++++-------- lnet/ulnds/tcplnd.c | 18 ++++++++++-------- lustre/portals/unals/connection.c | 7 ++++--- lustre/portals/unals/connection.h | 12 +++--------- lustre/portals/unals/tcpnal.c | 18 ++++++++++-------- 9 files changed, 51 insertions(+), 60 deletions(-) diff --git a/lnet/ulnds/connection.c b/lnet/ulnds/connection.c index 89c9f78..310e899 100644 --- a/lnet/ulnds/connection.c +++ b/lnet/ulnds/connection.c @@ -120,9 +120,10 @@ int read_connection(connection c, return(1); } -static int connection_input(connection c) +static int connection_input(void *d) { - return((*c->m->handler)(c->m->handler_arg,c)); + connection c = d; + return((*c->m->handler)(c->m->handler_arg,c)); } @@ -280,7 +281,7 @@ void shutdown_connections(manager m) * zero if the fixed port could not be bound */ manager init_connections(unsigned short pid, - int (*input)(), + int (*input)(void *, void *), void *a) { manager m=(manager)malloc(sizeof(struct manager)); diff --git a/lnet/ulnds/connection.h b/lnet/ulnds/connection.h index f6b2994..6f57287 100644 --- a/lnet/ulnds/connection.h +++ b/lnet/ulnds/connection.h @@ -25,14 +25,8 @@ typedef struct connection { manager m; } *connection; -connection force_tcp_connection(manager m, - unsigned int ip, - unsigned int short); -manager init_connections(unsigned short, - int (*f)(void *,connection), - void *); +connection force_tcp_connection(manager m, unsigned int ip, unsigned int short); +manager init_connections(unsigned short, int (*f)(void *, void *), void *); void remove_connection(void *arg); void shutdown_connections(manager m); -int read_connection(connection c, - unsigned char *dest, - int len); +int read_connection(connection c, unsigned char *dest, int len); diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c index 89c9f78..310e899 100644 --- a/lnet/ulnds/socklnd/connection.c +++ b/lnet/ulnds/socklnd/connection.c @@ -120,9 +120,10 @@ int read_connection(connection c, return(1); } -static int connection_input(connection c) +static int connection_input(void *d) { - return((*c->m->handler)(c->m->handler_arg,c)); + connection c = d; + return((*c->m->handler)(c->m->handler_arg,c)); } @@ -280,7 +281,7 @@ void shutdown_connections(manager m) * zero if the fixed port could not be bound */ manager init_connections(unsigned short pid, - int (*input)(), + int (*input)(void *, void *), void *a) { manager m=(manager)malloc(sizeof(struct manager)); diff --git a/lnet/ulnds/socklnd/connection.h b/lnet/ulnds/socklnd/connection.h index f6b2994..6f57287 100644 --- a/lnet/ulnds/socklnd/connection.h +++ b/lnet/ulnds/socklnd/connection.h @@ -25,14 +25,8 @@ typedef struct connection { manager m; } *connection; -connection force_tcp_connection(manager m, - unsigned int ip, - unsigned int short); -manager init_connections(unsigned short, - int (*f)(void *,connection), - void *); +connection force_tcp_connection(manager m, unsigned int ip, unsigned int short); +manager init_connections(unsigned short, int (*f)(void *, void *), void *); void remove_connection(void *arg); void shutdown_connections(manager m); -int read_connection(connection c, - unsigned char *dest, - int len); +int read_connection(connection c, unsigned char *dest, int len); diff --git a/lnet/ulnds/socklnd/tcplnd.c b/lnet/ulnds/socklnd/tcplnd.c index 8bf55c4..534fc17 100644 --- a/lnet/ulnds/socklnd/tcplnd.c +++ b/lnet/ulnds/socklnd/tcplnd.c @@ -151,15 +151,17 @@ int tcpnal_recv(nal_cb_t *n, * available. It attempts to read the portals header and * pass it to the generic library for processing. */ -static int from_connection(void *a,connection c) +static int from_connection(void *a, void *d) { - bridge b=a; - ptl_hdr_t hdr; - if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ - lib_parse(b->nal_cb, &hdr, c); - return(1); - } - return(0); + connection c = d; + bridge b=a; + ptl_hdr_t hdr; + + if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ + lib_parse(b->nal_cb, &hdr, c); + return(1); + } + return(0); } diff --git a/lnet/ulnds/tcplnd.c b/lnet/ulnds/tcplnd.c index 8bf55c4..534fc17 100644 --- a/lnet/ulnds/tcplnd.c +++ b/lnet/ulnds/tcplnd.c @@ -151,15 +151,17 @@ int tcpnal_recv(nal_cb_t *n, * available. It attempts to read the portals header and * pass it to the generic library for processing. */ -static int from_connection(void *a,connection c) +static int from_connection(void *a, void *d) { - bridge b=a; - ptl_hdr_t hdr; - if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ - lib_parse(b->nal_cb, &hdr, c); - return(1); - } - return(0); + connection c = d; + bridge b=a; + ptl_hdr_t hdr; + + if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ + lib_parse(b->nal_cb, &hdr, c); + return(1); + } + return(0); } diff --git a/lustre/portals/unals/connection.c b/lustre/portals/unals/connection.c index 89c9f78..310e899 100644 --- a/lustre/portals/unals/connection.c +++ b/lustre/portals/unals/connection.c @@ -120,9 +120,10 @@ int read_connection(connection c, return(1); } -static int connection_input(connection c) +static int connection_input(void *d) { - return((*c->m->handler)(c->m->handler_arg,c)); + connection c = d; + return((*c->m->handler)(c->m->handler_arg,c)); } @@ -280,7 +281,7 @@ void shutdown_connections(manager m) * zero if the fixed port could not be bound */ manager init_connections(unsigned short pid, - int (*input)(), + int (*input)(void *, void *), void *a) { manager m=(manager)malloc(sizeof(struct manager)); diff --git a/lustre/portals/unals/connection.h b/lustre/portals/unals/connection.h index f6b2994..6f57287 100644 --- a/lustre/portals/unals/connection.h +++ b/lustre/portals/unals/connection.h @@ -25,14 +25,8 @@ typedef struct connection { manager m; } *connection; -connection force_tcp_connection(manager m, - unsigned int ip, - unsigned int short); -manager init_connections(unsigned short, - int (*f)(void *,connection), - void *); +connection force_tcp_connection(manager m, unsigned int ip, unsigned int short); +manager init_connections(unsigned short, int (*f)(void *, void *), void *); void remove_connection(void *arg); void shutdown_connections(manager m); -int read_connection(connection c, - unsigned char *dest, - int len); +int read_connection(connection c, unsigned char *dest, int len); diff --git a/lustre/portals/unals/tcpnal.c b/lustre/portals/unals/tcpnal.c index 8bf55c4..534fc17 100644 --- a/lustre/portals/unals/tcpnal.c +++ b/lustre/portals/unals/tcpnal.c @@ -151,15 +151,17 @@ int tcpnal_recv(nal_cb_t *n, * available. It attempts to read the portals header and * pass it to the generic library for processing. */ -static int from_connection(void *a,connection c) +static int from_connection(void *a, void *d) { - bridge b=a; - ptl_hdr_t hdr; - if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ - lib_parse(b->nal_cb, &hdr, c); - return(1); - } - return(0); + connection c = d; + bridge b=a; + ptl_hdr_t hdr; + + if (read_connection(c, (unsigned char *)&hdr, sizeof(hdr))){ + lib_parse(b->nal_cb, &hdr, c); + return(1); + } + return(0); } -- 1.8.3.1