Remove another bunch of pointless casting attempts

1 files changed, 37 insertions, 40 deletions

diff --git a/lib/sdp.c b/lib/sdp.c
index 63dcabf1..bc324eea 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -637,14 +637,14 @@ void sdp_attr_remove(sdp_record_t *rec, uint16_t attr)
 
 void sdp_set_seq_len(uint8_t *ptr, uint32_t length)
 {
-	uint8_t dtd = *(uint8_t *) ptr++;
+	uint8_t dtd = *ptr++;
 
 	switch (dtd) {
 	case SDP_SEQ8:
 	case SDP_ALT8:
 	case SDP_TEXT_STR8:
 	case SDP_URL_STR8:
-		*(uint8_t *)ptr = (uint8_t) length;
+		*ptr = (uint8_t) length;
 		break;
 	case SDP_SEQ16:
 	case SDP_ALT16:
@@ -1163,7 +1163,7 @@ static sdp_data_t *extract_uuid(const uint8_t *p, int bufsize, int *len,
 		free(d);
 		return NULL;
 	}
-	d->dtd = *(uint8_t *) p;
+	d->dtd = *p;
 	if (rec)
 		sdp_pattern_add_uuid(rec, &d->val.uuid);
 	return d;
@@ -1584,7 +1584,7 @@ static sdp_data_t *sdp_copy_seq(sdp_data_t *data)
 
 		value = sdp_data_value(tmp, NULL);
 		datatmp = sdp_data_alloc_with_length(tmp->dtd, value,
-					tmp->unitSize);
+								tmp->unitSize);
 
 		if (cur)
 			cur->next = datatmp;
@@ -1610,7 +1610,7 @@ static void sdp_copy_attrlist(void *value, void *udata)
 		sdp_attr_add_new(rec, data->attrId, data->dtd, val);
 	else
 		sdp_attr_add_new_with_length(rec, data->attrId,
-			data->dtd, val, len);
+							data->dtd, val, len);
 }
 
 sdp_record_t *sdp_copy_record(sdp_record_t *rec)
@@ -1712,7 +1712,7 @@ sdp_data_t *sdp_data_get(const sdp_record_t *rec, uint16_t attrId)
 		sdpTemplate.attrId = attrId;
 		p = sdp_list_find(rec->attrlist, &sdpTemplate, sdp_attrid_comp_func);
 		if (p)
-			return (sdp_data_t *)p->data;
+			return p->data;
 	}
 	return NULL;
 }
@@ -1753,8 +1753,8 @@ int sdp_send_req_w4_rsp(sdp_session_t *session, uint8_t *reqbuf,
 			uint8_t *rspbuf, uint32_t reqsize, uint32_t *rspsize)
 {
 	int n;
-	sdp_pdu_hdr_t *reqhdr = (sdp_pdu_hdr_t *)reqbuf;
-	sdp_pdu_hdr_t *rsphdr = (sdp_pdu_hdr_t *)rspbuf;
+	sdp_pdu_hdr_t *reqhdr = (sdp_pdu_hdr_t *) reqbuf;
+	sdp_pdu_hdr_t *rsphdr = (sdp_pdu_hdr_t *) rspbuf;
 
 	SDPDBG("");
 	if (0 > sdp_send_req(session, reqbuf, reqsize)) {
@@ -1876,7 +1876,7 @@ int sdp_get_proto_port(const sdp_list_t *list, int proto)
 	for (; list; list = list->next) {
 		sdp_list_t *p;
 		for (p = list->data; p; p = p->next) {
-			sdp_data_t *seq = (sdp_data_t *) p->data;
+			sdp_data_t *seq = p->data;
 			int port = __find_port(seq, proto);
 			if (port)
 				return port;
@@ -1890,7 +1890,7 @@ sdp_data_t *sdp_get_proto_desc(sdp_list_t *list, int proto)
 	for (; list; list = list->next) {
 		sdp_list_t *p;
 		for (p = list->data; p; p = p->next) {
-			sdp_data_t *seq = (sdp_data_t *) p->data;
+			sdp_data_t *seq = p->data;
 			if (SDP_IS_UUID(seq->dtd) &&
 					sdp_uuid_to_proto(&seq->val.uuid) == proto)
 				return seq->next;
@@ -1999,7 +1999,7 @@ int sdp_set_uuidseq_attr(sdp_record_t *rec, uint16_t aid, sdp_list_t *seq)
 	}
 
 	for (p = seq, i = 0; i < len; i++, p = p->next) {
-		uuid_t *uuid = (uuid_t *)p->data;
+		uuid_t *uuid = p->data;
 		if (uuid)
 			switch (uuid->type) {
 			case SDP_UUID16:
@@ -2244,14 +2244,14 @@ void sdp_set_info_attr(sdp_record_t *rec, const char *name, const char *prov,
 							const char *desc)
 {
 	if (name)
-		sdp_attr_add_new(rec, SDP_ATTR_SVCNAME_PRIMARY, SDP_TEXT_STR8,
-								(void *)name);
+		sdp_attr_add_new(rec, SDP_ATTR_SVCNAME_PRIMARY,
+							SDP_TEXT_STR8, name);
 	if (prov)
-		sdp_attr_add_new(rec, SDP_ATTR_PROVNAME_PRIMARY, SDP_TEXT_STR8,
-								(void *)prov);
+		sdp_attr_add_new(rec, SDP_ATTR_PROVNAME_PRIMARY,
+							SDP_TEXT_STR8, prov);
 	if (desc)
-		sdp_attr_add_new(rec, SDP_ATTR_SVCDESC_PRIMARY, SDP_TEXT_STR8,
-								(void *)desc);
+		sdp_attr_add_new(rec, SDP_ATTR_SVCDESC_PRIMARY,
+							SDP_TEXT_STR8, desc);
 }
 
 static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
@@ -2274,12 +2274,12 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
 	}
 
 	for (i = 0, p = proto; p; p = p->next, i++) {
-		sdp_list_t *elt = (sdp_list_t *)p->data;
+		sdp_list_t *elt = p->data;
 		sdp_data_t *s;
 		uuid_t *uuid = NULL;
 		unsigned int pslen = 0;
 		for (; elt && pslen < ARRAY_SIZE(dtds); elt = elt->next, pslen++) {
-			sdp_data_t *d = (sdp_data_t *)elt->data;
+			sdp_data_t *d = elt->data;
 			dtds[pslen] = &d->dtd;
 			switch (d->dtd) {
 			case SDP_UUID16:
@@ -2344,8 +2344,7 @@ int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
 	sdp_data_t *protos = NULL;
 
 	for (p = ap; p; p = p->next) {
-		sdp_data_t *seq = access_proto_to_dataseq(rec,
-						(sdp_list_t *) p->data);
+		sdp_data_t *seq = access_proto_to_dataseq(rec, p->data);
 		protos = sdp_seq_append(protos, seq);
 	}
 
@@ -2360,8 +2359,7 @@ int sdp_set_add_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
 	sdp_data_t *protos = NULL;
 
 	for (p = ap; p; p = p->next) {
-		sdp_data_t *seq = access_proto_to_dataseq(rec,
-						(sdp_list_t *) p->data);
+		sdp_data_t *seq = access_proto_to_dataseq(rec, p->data);
 		protos = sdp_seq_append(protos, seq);
 	}
 
@@ -2405,7 +2403,7 @@ int sdp_set_lang_attr(sdp_record_t *rec, const sdp_list_t *seq)
 	}
 
 	for (p = seq; p; p = p->next) {
-		sdp_lang_attr_t *lang = (sdp_lang_attr_t *)p->data;
+		sdp_lang_attr_t *lang = p->data;
 		if (!lang) {
 			status = -1;
 			break;
@@ -2521,7 +2519,7 @@ int sdp_set_profile_descs(sdp_record_t *rec, const sdp_list_t *profiles)
 	for (p = profiles; p; p = p->next) {
 		sdp_data_t *seq;
 		void *dtds[2], *values[2];
-		sdp_profile_desc_t *profile = (sdp_profile_desc_t *)p->data;
+		sdp_profile_desc_t *profile = p->data;
 		if (!profile) {
 			status = -1;
 			break;
@@ -2634,8 +2632,8 @@ int sdp_uuid_cmp(const void *p1, const void *p2)
  */
 int sdp_uuid16_cmp(const void *p1, const void *p2)
 {
-	const uuid_t *u1 = (const uuid_t *)p1;
-	const uuid_t *u2 = (const uuid_t *)p2;
+	const uuid_t *u1 = p1;
+	const uuid_t *u2 = p2;
 	return memcmp(&u1->value.uuid16, &u2->value.uuid16, sizeof(uint16_t));
 }
 
@@ -2645,8 +2643,8 @@ int sdp_uuid16_cmp(const void *p1, const void *p2)
  */
 int sdp_uuid128_cmp(const void *p1, const void *p2)
 {
-	const uuid_t *u1 = (const uuid_t *)p1;
-	const uuid_t *u2 = (const uuid_t *)p2;
+	const uuid_t *u1 = p1;
+	const uuid_t *u2 = p2;
 	return memcmp(&u1->value.uuid128, &u2->value.uuid128, sizeof(uint128_t));
 }
 
@@ -2777,14 +2775,14 @@ int sdp_uuid_to_proto(uuid_t *uuid)
 void sdp_append_to_buf(sdp_buf_t *dst, uint8_t *data, uint32_t len)
 {
 	uint8_t *p = dst->data;
-	uint8_t dtd = *(uint8_t *) p;
+	uint8_t dtd = *p;
 
 	SDPDBG("Append src size: %d\n", len);
 	SDPDBG("Append dst size: %d\n", dst->data_size);
 	SDPDBG("Dst buffer size: %d\n", dst->buf_size);
 	if (dst->data_size == 0 && dtd == 0) {
 		/* create initial sequence */
-		*(uint8_t *)p = SDP_SEQ8;
+		*p = SDP_SEQ8;
 		p += sizeof(uint8_t);
 		dst->data_size += sizeof(uint8_t);
 		/* reserve space for sequence size */
@@ -2795,13 +2793,13 @@ void sdp_append_to_buf(sdp_buf_t *dst, uint8_t *data, uint32_t len)
 	memcpy(dst->data + dst->data_size, data, len);
 	dst->data_size += len;
 
-	dtd = *(uint8_t *)dst->data;
+	dtd = *(uint8_t *) dst->data;
 	if (dst->data_size > UCHAR_MAX && dtd == SDP_SEQ8) {
 		short offset = sizeof(uint8_t) + sizeof(uint8_t);
 		memmove(dst->data + offset + 1, dst->data + offset,
 						dst->data_size - offset);
 		p = dst->data;
-		*(uint8_t *) p = SDP_SEQ16;
+		*p = SDP_SEQ16;
 		p += sizeof(uint8_t);
 		dst->data_size += 1;
 	}
@@ -3154,7 +3152,7 @@ sdp_record_t *sdp_record_alloc()
 	if (!rec)
 		return NULL;
 
-	memset((void *)rec, 0, sizeof(sdp_record_t));
+	memset(rec, 0, sizeof(sdp_record_t));
 	rec->handle = 0xffffffff;
 	return rec;
 }
@@ -3164,7 +3162,7 @@ sdp_record_t *sdp_record_alloc()
  */
 void sdp_record_free(sdp_record_t *rec)
 {
-	sdp_list_free(rec->attrlist, (sdp_free_func_t)sdp_data_free);
+	sdp_list_free(rec->attrlist, (sdp_free_func_t) sdp_data_free);
 	sdp_list_free(rec->pattern, free);
 	free(rec);
 }
@@ -3173,9 +3171,8 @@ void sdp_pattern_add_uuid(sdp_record_t *rec, uuid_t *uuid)
 {
 	uuid_t *uuid128 = sdp_uuid_to_uuid128(uuid);
 
-	SDPDBG("SvcRec : 0x%lx\n", (unsigned long)rec);
 	SDPDBG("Elements in target pattern : %d\n", sdp_list_len(rec->pattern));
-	SDPDBG("Trying to add : 0x%lx\n", (unsigned long)uuid128);
+	SDPDBG("Trying to add : 0x%lx\n", (unsigned long) uuid128);
 
 	if (sdp_list_find(rec->pattern, uuid128, sdp_uuid128_cmp) == NULL)
 		rec->pattern = sdp_list_insert_sorted(rec->pattern, uuid128, sdp_uuid128_cmp);
@@ -3290,7 +3287,7 @@ static int gen_dataseq_pdu(uint8_t *dst, const sdp_list_t *seq, uint8_t dtd)
 
 static int gen_searchseq_pdu(uint8_t *dst, const sdp_list_t *seq)
 {
-	uuid_t *uuid = (uuid_t *) seq->data;
+	uuid_t *uuid = seq->data;
 	return gen_dataseq_pdu(dst, seq, uuid->type);
 }
 
@@ -4589,7 +4586,7 @@ static int sdp_connect_local(sdp_session_t *session)
 	sa.sun_family = AF_UNIX;
 	strcpy(sa.sun_path, SDP_UNIX_PATH);
 
-	return connect(session->sock, (struct sockaddr *)&sa, sizeof(sa));
+	return connect(session->sock, (struct sockaddr *) &sa, sizeof(sa));
 }
 
 static int sdp_connect_l2cap(const bdaddr_t *src,
@@ -4764,7 +4761,7 @@ int sdp_get_supp_feat(const sdp_record_t *rec, sdp_list_t **seqp)
 
 	if (!sdpdata || sdpdata->dtd < SDP_SEQ8 || sdpdata->dtd > SDP_SEQ32)
 		return sdp_get_uuidseq_attr(rec,
-				     SDP_ATTR_SUPPORTED_FEATURES_LIST, seqp);
+					SDP_ATTR_SUPPORTED_FEATURES_LIST, seqp);
 
 	for (d = sdpdata->val.dataseq; d; d = d->next) {
 		sdp_data_t *dd;