[Warnings] Fix build warnings.

[platform/adaptation/bluetooth-firmware-bcm.git] / set-address / setbd.c

diff --git a/set-address/setbd.c b/set-address/setbd.c
old mode 100644 (file)
new mode 100755 (executable)
index 092da16..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);
@@ -196,75 +197,17 @@ int readBDaddrTI(void){
        return 0;
 }
 #endif
-int make_bt_address_from_tapi_imei(unsigned char * bt_address)
-{
-       char * temp=NULL;
-       int tapi_state=0;
-       int ret=-1;
-       int i=0;
-
-       if(bt_address==NULL)
-               return -EBADR;
-
-       ret=vconf_get_int(VCONFKEY_TELEPHONY_TAPI_STATE,&tapi_state);
-       if(tapi_state==VCONFKEY_TELEPHONY_TAPI_STATE_READY && ret==0){
-               temp=vconf_get_str(VCONFKEY_TELEPHONY_IMEI);
-               APP_DEBUG("TAPI_IMEI: %s\n",temp);
-
-#ifdef IMEI_BASED_RAND_FEATURE
-               if(strcmp(temp,DEFAULT_IMEI)==0){
-                       APP_DEBUG("TAPI_IMEI is defulat IMEI\n");
-                       is_default_imei=TRUE;
-                       return -ENODATA;
-               }
-#else
-               APP_DEBUG("Temporarily we skip reading TAPI_IMEI\n");
-               APP_DEBUG("  due to TAPI IMEI API is deprecated\n");
-               is_default_imei=TRUE;
-               return -ENODATA;
-#endif
-
-               if(strcmp(temp,"")==0)
-                       return -ENODATA;
-
-               if(strlen(temp)<14)
-                       return -ENODATA;
-
-               memcpy(bt_address, BD_PREFIX, 5);
-
-               for(i=5 ;i<14;i++){
-                       if(i==7){
-                               bt_address[i]='\n';
-                               continue;
-                       }
-
-                       bt_address[i]=temp[i];
-               }
-
-       }else{
-               APP_DEBUG("TAPI_IMEI Reading Error\n");
-               return -ENODATA;
-       }
-
-       APP_DEBUG("Bluetooth Address\n");
-       for(i=0;i<BD_ADDR_LEN;i++)
-               APP_DEBUG("%c",bt_address[i]);
-
-       APP_DEBUG("\n");
-
-       return 0;
-
-}
 
 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);
@@ -277,7 +220,7 @@ int make_bt_address(gboolean overwrite_bt_address)
 
                if(overwrite_bt_address)
                {
-                       APP_DEBUG("Overwrite BT address because TAPI write correct IMEI.\n");
+                       APP_DEBUG("Overwrite BT address\n");
                }
 
                fd=open(BD_ADDR_FILE, O_RDWR | O_CREAT | O_TRUNC | O_SYNC, 0644);
@@ -287,10 +230,8 @@ int make_bt_address(gboolean overwrite_bt_address)
                        APP_DEBUG("Can't open address file\n");
                        return 0;
                }
-               success_make_bt_address_from_imei=make_bt_address_from_tapi_imei(txt);
 
-               if(success_make_bt_address_from_imei<0)
-                       makeRandomBD(txt);
+               makeRandomBD(txt);
 
                ret = write(fd, txt, BD_ADDR_LEN);
                lseek(fd, 0, SEEK_SET);
@@ -354,32 +295,6 @@ int make_bt_address(gboolean overwrite_bt_address)
 #endif
 }
 
-void vconf_cb(keynode_t *key, void * data)
-{
-       char * key_string=NULL;
-
-       switch(vconf_keynode_get_type(key))
-       {
-               case VCONF_TYPE_STRING:
-                       key_string=vconf_keynode_get_str(key);
-                       if(strcmp(key_string,"")!=0)
-                       {
-                               APP_DEBUG("Vconf Call back trial\n");
-                               /* This case means TAPI writes IMEI correctly */
-                               /* Because we write BT address which comes from IMEI again  */
-                               make_bt_address(TRUE);
-                               g_main_loop_quit(loop);
-                       }
-
-                       break;
-
-
-               default:
-                       break;
-       }
-       return;
-}
-
 gboolean exit_cb(gpointer data)
 {
 
@@ -401,12 +316,8 @@ int main()
                exit(0);
 
 #ifdef IMEI_BASED_RAND_FEATURE
-       vconf_notify_key_changed(VCONFKEY_TELEPHONY_IMEI,vconf_cb,NULL);
-
        g_timeout_add_seconds(10,exit_cb,NULL);
        g_main_loop_run(loop);
-
-       vconf_ignore_key_changed(VCONFKEY_TELEPHONY_IMEI,vconf_cb);
 #endif
 
        return 0;