Fixed some warnings.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4511 818b1a75-f10b-46b9-bf7c-635c3b92a50f

targets/SIMU/USER/oaisim_functions.c

@@ -745,7 +745,7 @@ void update_omg () {
     if (oai_emulation.info.omg_model_enb >= MAX_NUM_MOB_TYPES) {      // mix mobility model
       for (eNB_id = oai_emulation.info.first_enb_local; eNB_id < (oai_emulation.info.first_enb_local + oai_emulation.info.nb_enb_local); eNB_id++) {
         new_omg_model = randomGen (STATIC, RWALK);
-        LOG_D (OMG,"[eNB] Node of ID %d is changing mobility generator ->%d \n", UE_id, new_omg_model);
+        LOG_D (OMG,"[eNB] Node of ID %d is changing mobility generator ->%d \n", eNB_id, new_omg_model);
         // reset the mobility model for a specific node
         set_new_mob_type (eNB_id, eNB, new_omg_model, oai_emulation.info.time_s);
       }

targets/SIMU/USER/sinr_sim.c

@@ -536,24 +536,26 @@ void get_beta_map() {
       }
     }
     // else {
-      fgets(buffer, 1000, fp);
-      fgets(buffer, 1000, fp);
-      table_length[mcs]=0;
-      while (!feof(fp)) {
-	u=0;
-        sinr_bler = strtok(buffer, ";");
-	while(sinr_bler != NULL){
-	  perf_array[u]=atof(sinr_bler);
+    if (fgets (buffer, 1000, fp) != NULL) {
+      if (fgets (buffer, 1000, fp) != NULL) {
+        table_length[mcs] = 0;
+        while (!feof (fp)) {
+          u = 0;
+          sinr_bler = strtok (buffer, ";");
+          while (sinr_bler != NULL) {
+            perf_array[u] = atof (sinr_bler);
             u++;
-	  sinr_bler = strtok(NULL,";");
+            sinr_bler = strtok (NULL, ";");
           }
-	if((perf_array[4]/perf_array[5]) < 1){
+          if ((perf_array[4] / perf_array[5]) < 1) {
             sinr_bler_map[mcs][0][table_length[mcs]] = perf_array[0];
-	  sinr_bler_map[mcs][1][table_length[mcs]] = (perf_array[4]/perf_array[5]);
+            sinr_bler_map[mcs][1][table_length[mcs]] = (perf_array[4] / perf_array[5]);
             table_length[mcs]++;
           }
-	fgets(buffer, 1000, fp);
-	
+          if (fgets (buffer, 1000, fp) != NULL) {
+          }
+        }
+      }
     }
       fclose(fp);
       //   }
@@ -592,14 +594,15 @@ void get_MIESM_param() {
 	  while (!feof(fp)) {
 	    table_len =0;
 	    cnt++;
-	    fgets(buffer, 10000, fp);
-	    result = strtok(buffer, ",");
+	    if (fgets(buffer, 10000, fp) != NULL) {
+              result = strtok (buffer, ",");
               while (result != NULL) {
-	      MI_map_4qam[cnt][table_len]= atof(result);
-	      result = strtok(NULL, ",");
+                MI_map_4qam[cnt][table_len] = atof (result);
+                result = strtok (NULL, ",");
                 table_len++;
               }
             }
+	  }
        fclose(fp);
        for (t = 0; t < 162; t++){
 	 // MI_map_4Qam[0][t] = pow(10,0.1*(MI_map_4Qam[0][t]));
@@ -611,14 +614,15 @@ void get_MIESM_param() {
 	   while (!feof(fp)) {
 	    table_len =0;
 	    cnt++;
-	    fgets(buffer, 10000, fp);
-	    result = strtok(buffer, ",");
+            if (fgets (buffer, 10000, fp) != NULL) {
+              result = strtok (buffer, ",");
               while (result != NULL) {
-	      MI_map_16qam[cnt][table_len]= atof(result);
-	      result = strtok(NULL, ",");
+                MI_map_16qam[cnt][table_len] = atof (result);
+                result = strtok (NULL, ",");
                 table_len++;
               }
             }
+	  }
        fclose(fp);
        for (t = 0; t < 197; t++){
 	 // MI_map_16Qam[0][t] = pow(10,0.1*(MI_map_16Qam[0][t]));
@@ -632,7 +636,7 @@ void get_MIESM_param() {
 	    cnt++;
 	    if(cnt==3)
 	      break;
-	    fgets(buffer, 10000, fp);
+            if (fgets (buffer, 10000, fp) != NULL) {
               result = strtok(buffer, ",");
               while (result != NULL) {
                 MI_map_64qam[cnt][table_len]= atof(result);
@@ -640,6 +644,7 @@ void get_MIESM_param() {
                 table_len++;
               }
             }
+	  }
        fclose(fp);
        for (t = 0; t < 227; t++){
 	 //MI_map_64Qam[0][t] = pow(10,0.1*(MI_map_64Qam[0][t]));