Page MenuHomeFreeBSD
Files F175975459

D60729.diff
No OneTemporary
Actions

D60729.diff
View Options

diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -89,7 +89,7 @@
}
int
-proto_common_send(int sock, const unsigned char *data, size_t size, int fd)
+proto_common_send(int sock, const void *data, size_t size, int fd)
{
ssize_t done;
size_t sendsize;
@@ -190,7 +190,7 @@
}
int
-proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp)
+proto_common_recv(int sock, void *data, size_t size, int *fdp)
{
ssize_t done;
diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h
--- a/sbin/hastd/proto_impl.h
+++ b/sbin/hastd/proto_impl.h
@@ -44,8 +44,8 @@
typedef int prt_server_t(const char *, void **);
typedef int prt_accept_t(void *, void **);
typedef int prt_wrap_t(int, bool, void **);
-typedef int prt_send_t(void *, const unsigned char *, size_t, int);
-typedef int prt_recv_t(void *, unsigned char *, size_t, int *);
+typedef int prt_send_t(void *, const void *, size_t, int);
+typedef int prt_recv_t(void *, void *, size_t, int *);
typedef int prt_descriptor_t(const void *);
typedef bool prt_address_match_t(const void *, const char *);
typedef void prt_local_address_t(const void *, char *, size_t);
@@ -72,7 +72,7 @@
void proto_register(struct proto *proto, bool isdefault);
-int proto_common_send(int sock, const unsigned char *data, size_t size, int fd);
-int proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp);
+int proto_common_send(int sock, const void *data, size_t size, int fd);
+int proto_common_recv(int sock, void *data, size_t size, int *fdp);
#endif /* !_PROTO_IMPL_H_ */
diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -82,7 +82,7 @@
}
static int
-sp_send(void *ctx, const unsigned char *data, size_t size, int fd)
+sp_send(void *ctx, const void *data, size_t size, int fd)
{
struct sp_ctx *spctx = ctx;
int sock;
@@ -121,7 +121,7 @@
}
static int
-sp_recv(void *ctx, unsigned char *data, size_t size, int *fdp)
+sp_recv(void *ctx, void *data, size_t size, int *fdp)
{
struct sp_ctx *spctx = ctx;
int fd;
diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -479,7 +479,7 @@
}
static int
-tcp_send(void *ctx, const unsigned char *data, size_t size, int fd)
+tcp_send(void *ctx, const void *data, size_t size, int fd)
{
struct tcp_ctx *tctx = ctx;
@@ -492,7 +492,7 @@
}
static int
-tcp_recv(void *ctx, unsigned char *data, size_t size, int *fdp)
+tcp_recv(void *ctx, void *data, size_t size, int *fdp)
{
struct tcp_ctx *tctx = ctx;
diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c
--- a/sbin/hastd/proto_uds.c
+++ b/sbin/hastd/proto_uds.c
@@ -227,7 +227,7 @@
}
static int
-uds_send(void *ctx, const unsigned char *data, size_t size, int fd)
+uds_send(void *ctx, const void *data, size_t size, int fd)
{
struct uds_ctx *uctx = ctx;
@@ -239,7 +239,7 @@
}
static int
-uds_recv(void *ctx, unsigned char *data, size_t size, int *fdp)
+uds_recv(void *ctx, void *data, size_t size, int *fdp)
{
struct uds_ctx *uctx = ctx;

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 15, 11:00 PM (17 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40873164
Default Alt Text
D60729.diff (3 KB)

Event Timeline