Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f0f3b2 authored by Alex Elder's avatar Alex Elder
Browse files

ceph: eliminate some abusive casts 



This fixes some spots where a type cast to (void *) was used as
as a universal type hiding mechanism.  Instead, properly cast the
type to the intended target type.

Signed-off-by: default avatarAlex Elder <elder@newdream.net>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent bd406145

net/ceph/messenger.c

+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss) 
{

	int i;

	char *s;

	struct sockaddr_in *in4 = (void *)ss;

	struct sockaddr_in6 *in6 = (void *)ss;

	struct sockaddr_in *in4 = (struct sockaddr_in *) ss;

	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;



	i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;

	s = addr_str[i];
@@ -1112,8 +1112,8 @@ static void addr_set_port(struct sockaddr_storage *ss, int p) 
static int ceph_pton(const char *str, size_t len, struct sockaddr_storage *ss,

		char delim, const char **ipend)

{

	struct sockaddr_in *in4 = (void *)ss;

	struct sockaddr_in6 *in6 = (void *)ss;

	struct sockaddr_in *in4 = (struct sockaddr_in *) ss;

	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;



	memset(ss, 0, sizeof(*ss));