From e29e186d496d43eb6fa3d625f2d9a1331532d795 Mon Sep 17 00:00:00 2001 From: Sudha Bheemanna Date: Thu, 17 Mar 2016 15:13:21 +0530 Subject: [PATCH] [Warnings] Fix build warnings. Fixed build time warnings in the code Change-Id: Ifab02bdbd82abe0f2feac374741a877b0c9946da Signed-off-by: Sudha Bheemanna --- CMakeLists.txt | 2 +- set-address/setbd.c | 8 +++++--- tools/bcmtool_4330b1.c | 27 ++++++++++++++++++--------- tools/bcmtool_4358a1.c | 27 ++++++++++++++++++--------- 4 files changed, 42 insertions(+), 22 deletions(-) mode change 100644 => 100755 set-address/setbd.c mode change 100644 => 100755 tools/bcmtool_4330b1.c mode change 100644 => 100755 tools/bcmtool_4358a1.c diff --git a/CMakeLists.txt b/CMakeLists.txt index c0285fa..919624a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ FOREACH(flag ${package_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") ADD_SUBDIRECTORY(set-address) ADD_SUBDIRECTORY(tools) diff --git a/set-address/setbd.c b/set-address/setbd.c old mode 100644 new mode 100755 index 013a92f..0fb6b83 --- a/set-address/setbd.c +++ b/set-address/setbd.c @@ -69,10 +69,9 @@ static gboolean is_default_imei=FALSE; #if defined(BT_CHIP_CSR) || defined(BT_CHIP_BROADCOM) int addremoveBD(char* path, char* pskey){ FILE *fd, *new; - int ret; char cmp[READ_BD_FILE_MAX]; char *result; - + int ret; fd = fopen(path, "r"); if(NULL == fd){ APP_DBG("Error open psr file\r\n"); @@ -87,6 +86,8 @@ int addremoveBD(char* path, char* pskey){ } ret = fputs(pskey,new); + if (ret < 0) + return -1; while(1){ result = fgets(cmp, READ_BD_FILE_MAX, fd); @@ -202,10 +203,11 @@ int make_bt_address(gboolean overwrite_bt_address) #if defined(BT_CHIP_CSR) || defined(BT_CHIP_BROADCOM) int fd; - int i; unsigned char txt[BD_ADDR_LEN]; unsigned char nap[4+1], uap[2+1], lap[6+1]; +#if defined(BT_CHIP_CSR) char pskey[PSKEY_LEN+3]; +#endif int ret; fd=open(BD_ADDR_FILE, O_RDONLY | O_SYNC); diff --git a/tools/bcmtool_4330b1.c b/tools/bcmtool_4330b1.c old mode 100644 new mode 100755 index 6350a06..e615376 --- a/tools/bcmtool_4330b1.c +++ b/tools/bcmtool_4330b1.c @@ -223,6 +223,7 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf) { UINT8 pbuf[255] = {0,}; UINT8 i=0; + INT8 ret = 0; pbuf[0] = 0x1; pbuf[1] = (UINT8)(opcode); @@ -238,7 +239,10 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf) dump(pbuf, param_len+4); - write(fd, pbuf, param_len+4); + ret = write(fd, pbuf, param_len+4); + if (ret != 0) + return -1; + return 0; } @@ -349,6 +353,7 @@ UINT8 DownloadPatchram( char *patchram1 ) INT32 FileSize=0; INT32 SentSize=0; + INT8 ret = 0; DEBUG1( "\n%s\n", patchram1); @@ -385,9 +390,13 @@ UINT8 DownloadPatchram( char *patchram1 ) len = buffer[3]; - fread(&buffer[4],sizeof(UINT8),len, pFile); + ret = fread(&buffer[4],sizeof(UINT8),len, pFile); + if (ret != 0) + return -1; - write(fd, buffer, len + 4); + ret = write(fd, buffer, len + 4); + if (ret != 0) + return -1; /* dispaly progress*/ SentSize += (len + 3); @@ -781,14 +790,14 @@ int main(int argc, char *argv[]) { char text[BTUI_MAX_STRING_LENGTH_PER_LINE]; - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile)) != NULL) + sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]); - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x",&bdaddr[2]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile)) != NULL) + sscanf(text,"%02x",&bdaddr[2]); - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile)) != NULL) + sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]); fprintf(stderr,"Writing B/D Address = %02X:%02X:%02X:%02X:%02X:%02X\n",bdaddr[0],bdaddr[1],bdaddr[2],bdaddr[3],bdaddr[4],bdaddr[5]); diff --git a/tools/bcmtool_4358a1.c b/tools/bcmtool_4358a1.c old mode 100644 new mode 100755 index b35da8e..17dc7b4 --- a/tools/bcmtool_4358a1.c +++ b/tools/bcmtool_4358a1.c @@ -223,6 +223,7 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf) { UINT8 pbuf[255] = {0,}; UINT8 i=0; + UINT8 ret = 0; pbuf[0] = 0x1; pbuf[1] = (UINT8)(opcode); @@ -238,7 +239,10 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf) dump(pbuf, param_len+4); - write(fd, pbuf, param_len+4); + ret = write(fd, pbuf, param_len+4); + if (ret != 0) + return -1; + return 0; } @@ -349,6 +353,7 @@ UINT8 DownloadPatchram( char *patchram1 ) INT32 FileSize=0; INT32 SentSize=0; + INT8 ret = 0; DEBUG1( "\n%s\n", patchram1); @@ -385,9 +390,13 @@ UINT8 DownloadPatchram( char *patchram1 ) len = buffer[3]; - fread(&buffer[4],sizeof(UINT8),len, pFile); + ret = fread(&buffer[4],sizeof(UINT8),len, pFile); + if (ret != 0) + return -1; - write(fd, buffer, len + 4); + ret = write(fd, buffer, len + 4); + if (ret != 0) + return -1; /* dispaly progress*/ SentSize += (len + 3); @@ -781,14 +790,14 @@ int main(int argc, char *argv[]) { char text[BTUI_MAX_STRING_LENGTH_PER_LINE]; - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))!= NULL) + sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]); - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x",&bdaddr[2]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile)) != NULL) + sscanf(text,"%02x",&bdaddr[2]); - fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile); - sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]); + if ((fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile)) != NULL) + sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]); fprintf(stderr,"Writing B/D Address = %02X:%02X:%02X:%02X:%02X:%02X\n",bdaddr[0],bdaddr[1],bdaddr[2],bdaddr[3],bdaddr[4],bdaddr[5]); -- 2.7.4