From 7f3507b606b0f5c0c44cc59eb27e87575cf87701 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sat, 26 Oct 2024 02:58:42 -0600 Subject: conventions: Don't have 2 ways to spell "implements_foo" Stop defining "struct foo" as a synonym for "implements_foo". --- cmd/srv9p/gnet.c | 12 ++++++------ cmd/srv9p/static9p.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'cmd/srv9p') diff --git a/cmd/srv9p/gnet.c b/cmd/srv9p/gnet.c index 699deaf..f1ea709 100644 --- a/cmd/srv9p/gnet.c +++ b/cmd/srv9p/gnet.c @@ -280,11 +280,11 @@ static int gnet_tcp_close(implements_net_stream_conn *_conn, bool rd, bool wr) { /* UDP init() *****************************************************************/ -static ssize_t gnet_udp_sendto(struct net_packet_conn *self, void *buf, size_t len, +static ssize_t gnet_udp_sendto(implements_net_packet_conn *self, void *buf, size_t len, struct net_ip4_addr addr, uint16_t port); -static ssize_t gnet_udp_recvfrom(struct net_packet_conn *self, void *buf, size_t len, +static ssize_t gnet_udp_recvfrom(implements_net_packet_conn *self, void *buf, size_t len, struct net_ip4_addr *ret_addr, uint16_t *ret_port); -static int gnet_udp_close(struct net_packet_conn *self); +static int gnet_udp_close(implements_net_packet_conn *self); static struct net_packet_conn_vtable gnet_udp_conn_vtable = { .sendto = gnet_udp_sendto, @@ -351,7 +351,7 @@ static void *gnet_pthread_sendto(void *_args) { return NULL; } -static ssize_t gnet_udp_sendto(struct net_packet_conn *_conn, void *buf, size_t count, +static ssize_t gnet_udp_sendto(implements_net_packet_conn *_conn, void *buf, size_t count, struct net_ip4_addr node, uint16_t port) { struct gnet_udp_conn *conn = VCALL_SELF(struct gnet_udp_conn, implements_net_packet_conn, _conn); @@ -418,7 +418,7 @@ static void *gnet_pthread_recvfrom(void *_args) { return NULL; } -static ssize_t gnet_udp_recvfrom(struct net_packet_conn *_conn, void *buf, size_t count, +static ssize_t gnet_udp_recvfrom(implements_net_packet_conn *_conn, void *buf, size_t count, struct net_ip4_addr *ret_node, uint16_t *ret_port) { struct gnet_udp_conn *conn = VCALL_SELF(struct gnet_udp_conn, implements_net_packet_conn, _conn); @@ -444,7 +444,7 @@ static ssize_t gnet_udp_recvfrom(struct net_packet_conn *_conn, void *buf, size_ /* UDP close() ****************************************************************/ -static int gnet_udp_close(struct net_packet_conn *_conn) { +static int gnet_udp_close(implements_net_packet_conn *_conn) { struct gnet_udp_conn *conn = VCALL_SELF(struct gnet_udp_conn, implements_net_packet_conn, _conn); assert(conn); diff --git a/cmd/srv9p/static9p.h b/cmd/srv9p/static9p.h index 98b85a2..e03a480 100644 --- a/cmd/srv9p/static9p.h +++ b/cmd/srv9p/static9p.h @@ -29,7 +29,7 @@ struct static_dir { _static_common; /* NULL-terminated */ - struct lib9p_srv_file *members[]; + implements_lib9p_srv_file *members[]; }; -- cgit v1.2.3-2-g168b