From cd484f61e9d8672441d342bc1d6fa3cd33edfd20 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Thu, 30 Apr 2015 17:46:03 +0000
Subject: [PATCH] Some type casts for clang.

FossilOrigin-Name: a050a29fc6795aee5f4592347026bfb9d7999972becacf1ddcec537213b84fb8
---
 src/Config.mak    | 4 ++--
 src/capwap/bstr.h | 2 +-
 src/capwap/dbg.c  | 6 +++---
 src/capwap/mbag.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Config.mak b/src/Config.mak
index db1d34d9..c6a91cd1 100644
--- a/src/Config.mak
+++ b/src/Config.mak
@@ -13,8 +13,8 @@ GNUTLS_VERSION=3.3.9
 USE_CONTRIB_GNUTLS=0
 
 # Compiler to use
-#CC=clang
-CC=gcc
+CC=clang
+#CC=gcc
 #CC=mips-openwrt-linux-uclibc-gcc
 #LD=mips-openwrt-linux-uclibc-ld
 #AR=mips-openwrt-linux-uclibc-ar
diff --git a/src/capwap/bstr.h b/src/capwap/bstr.h
index 44772e6e..b19e3d51 100644
--- a/src/capwap/bstr.h
+++ b/src/capwap/bstr.h
@@ -67,7 +67,7 @@ extern int bstr_to_str(char *dst, bstr_t str,char * def);
 
 typedef uint8_t *bstr16_t;
 #define bstr16_len(s) ( *((uint16_t*)(s)) )
-#define bstr16_data(s) ((s)+2)
+#define bstr16_data(s) (((uint8_t*)s)+2)
 #define bstr16_size(l) (l+2)
 #define BSTR16_MAX_LEN (0xffff-2)
 
diff --git a/src/capwap/dbg.c b/src/capwap/dbg.c
index af96886f..f645536c 100644
--- a/src/capwap/dbg.c
+++ b/src/capwap/dbg.c
@@ -502,9 +502,9 @@ int cw_format_item(char *dst,mbag_item_t * item)
 {
 	*dst=0;
 	if (item->type==MBAG_BSTR16){
-			strncpy(dst,bstr16_data(item->data),bstr16_len(item->data));
-			*(dst+bstr16_len(item->data))=0;
-			return bstr16_len(item->data);
+		strncpy(dst,(char*)bstr16_data(item->data),bstr16_len(item->data));
+		*(dst+bstr16_len(item->data))=0;
+		return bstr16_len(item->data);
 
 
 	}
diff --git a/src/capwap/mbag.c b/src/capwap/mbag.c
index aa999ef0..fc27d63e 100644
--- a/src/capwap/mbag.c
+++ b/src/capwap/mbag.c
@@ -27,7 +27,7 @@ static int mbag_bstr16str(void *item,char *dst)
 static int mbag_strstr(void *item,char *dst)
 {
 	mbag_item_t *i= item;
-        return sprintf(dst, "%s", i->data);
+        return sprintf(dst, "%s", (char*)i->data);
 }