Fix for "warning: promoted type int of K&R function parameter is not compatible with the parameter type ..."

This commit is contained in:
William Robinet 2020-10-06 10:05:25 +02:00
parent cbb6ecf373
commit 97f6623e71
3 changed files with 10 additions and 34 deletions

View file

@ -70,13 +70,8 @@ static int zero_conn(conn)
return(0); return(0);
} }
int tcp_find_conn(connp,directionp,saddr,sport,daddr,dport) int tcp_find_conn(tcp_conn **connp, int *directionp,struct in_addr *saddr,
tcp_conn **connp; u_short sport, struct in_addr *daddr, u_short dport)
int *directionp;
struct in_addr *saddr;
u_short sport;
struct in_addr *daddr;
u_short dport;
{ {
conn_struct *conn; conn_struct *conn;
@ -106,12 +101,8 @@ int tcp_find_conn(connp,directionp,saddr,sport,daddr,dport)
return(R_NOT_FOUND); return(R_NOT_FOUND);
} }
int tcp_create_conn(connp,i_addr,i_port,r_addr,r_port) int tcp_create_conn(tcp_conn **connp,struct in_addr *i_addr,
tcp_conn **connp; u_short i_port, struct in_addr *r_addr, u_short r_port)
struct in_addr *i_addr;
u_short i_port;
struct in_addr *r_addr;
u_short r_port;
{ {
conn_struct *conn=0; conn_struct *conn=0;

View file

@ -59,17 +59,9 @@ static int create_null_analyzer PROTO_LIST((void *handle,
struct in_addr *i_addr,u_short i_port, struct in_addr *i_addr,u_short i_port,
struct in_addr *r_addr,u_short r_port, struct timeval *base_time)); struct in_addr *r_addr,u_short r_port, struct timeval *base_time));
static int create_null_analyzer(handle,ctx,conn,objp,i_addr,i_port,r_addr,r_port, static int create_null_analyzer(void *handle, proto_ctx *ctx, tcp_conn *conn,
base_time) proto_obj **objp, struct in_addr *i_addr, u_short i_port, struct in_addr *r_addr,
void *handle; u_short r_port, struct timeval *base_time)
proto_ctx *ctx;
tcp_conn *conn;
proto_obj **objp;
struct in_addr *i_addr;
u_short i_port;
struct in_addr *r_addr;
u_short r_port;
struct timeval *base_time;
{ {
null_analyzer *obj=0; null_analyzer *obj=0;
static int ctr; static int ctr;

View file

@ -227,16 +227,9 @@ static int create_ssl_ctx(handle,ctxp)
return(_status); return(_status);
} }
static int create_ssl_analyzer(handle,ctx,conn,objp,i_addr,i_port,r_addr,r_port,base_time) static int create_ssl_analyzer(void *handle, proto_ctx *ctx, tcp_conn *conn,
void *handle; proto_obj **objp, struct in_addr *i_addr, u_short i_port, struct in_addr *r_addr,
proto_ctx *ctx; u_short r_port, struct timeval *base_time)
tcp_conn *conn;
proto_obj **objp;
struct in_addr *i_addr;
u_short i_port;
struct in_addr *r_addr;
u_short r_port;
struct timeval *base_time;
{ {
int r,_status; int r,_status;
ssl_obj *obj=0; ssl_obj *obj=0;