diff options
| author | trociny <trociny@FreeBSD.org> | 2013-12-10 20:02:09 +0000 |
|---|---|---|
| committer | trociny <trociny@FreeBSD.org> | 2013-12-10 20:02:09 +0000 |
| commit | cf869ff0c7af4f5e118961594625bb7b7eb7d7c4 (patch) | |
| tree | e6a13c93f36c2b7e6f315c712a24d61d06194a15 /sbin/hastd | |
| parent | 4c419dee1408dd302d13eefce1a8c4a41daeafb5 (diff) | |
| download | FreeBSD-src-cf869ff0c7af4f5e118961594625bb7b7eb7d7c4.zip FreeBSD-src-cf869ff0c7af4f5e118961594625bb7b7eb7d7c4.tar.gz | |
Fix compiler warnings.
MFC after: 2 weeks
Diffstat (limited to 'sbin/hastd')
| -rw-r--r-- | sbin/hastd/nv.c | 2 | ||||
| -rw-r--r-- | sbin/hastd/proto.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c index 8dcf697..fefc2df 100644 --- a/sbin/hastd/nv.c +++ b/sbin/hastd/nv.c @@ -566,7 +566,7 @@ nv_get_string(struct nv *nv, const char *namefmt, ...) return (NULL); PJDLOG_ASSERT((nvh->nvh_type & NV_ORDER_MASK) == NV_ORDER_HOST); PJDLOG_ASSERT(nvh->nvh_dsize >= 1); - str = NVH_DATA(nvh); + str = (char *)NVH_DATA(nvh); PJDLOG_ASSERT(str[nvh->nvh_dsize - 1] == '\0'); PJDLOG_ASSERT(strlen(str) == nvh->nvh_dsize - 1); return (str); diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c index 73487c0..53bbf7a 100644 --- a/sbin/hastd/proto.c +++ b/sbin/hastd/proto.c @@ -298,8 +298,8 @@ proto_connection_send(const struct proto_conn *conn, struct proto_conn *mconn) protoname = mconn->pc_proto->prt_name; PJDLOG_ASSERT(protoname != NULL); - ret = conn->pc_proto->prt_send(conn->pc_ctx, protoname, - strlen(protoname) + 1, fd); + ret = conn->pc_proto->prt_send(conn->pc_ctx, + (const unsigned char *)protoname, strlen(protoname) + 1, fd); proto_close(mconn); if (ret != 0) { errno = ret; @@ -325,7 +325,7 @@ proto_connection_recv(const struct proto_conn *conn, bool client, bzero(protoname, sizeof(protoname)); - ret = conn->pc_proto->prt_recv(conn->pc_ctx, protoname, + ret = conn->pc_proto->prt_recv(conn->pc_ctx, (unsigned char *)protoname, sizeof(protoname) - 1, &fd); if (ret != 0) { errno = ret; |
