nullPointerRedundantCheck

openair1/SIMULATION/TOOLS/channel_sim.c

@@ -344,7 +344,7 @@ void do_UL_sig(sim_t *sim, uint16_t subframe, uint8_t abstraction_flag, LTE_DL_F
   for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
     
     txdata = PHY_vars_UE_g[UE_id][CC_id]->common_vars.txdata;
-    AssertFatal(txdata != NULL,"txdata is null\n");
+    AssertFatal(txdata,"txdata is null\n");
 
     sf_offset = subframe*frame_parms->samples_per_tti;
     if (subframe>0) sf_offset_tdd = sf_offset - PHY_vars_UE_g[UE_id][CC_id]->N_TA_offset;

openair1/SIMULATION/TOOLS/random_channel.c

@@ -2033,8 +2033,8 @@ int get_channel_params(char *buf, int debug, void *vdata, telnet_printfunc_t prn
         }
         tdata->numlines++;
       }
+      return tdata->numlines;
     }
-    return tdata->numlines;
   } /* show */ else if (strstr(buf, "set") == buf) {
     char cmdbuf[TELNET_MAX_MSGLENGTH];
     int sst = sscanf(tdata->tblname, "%*[^=]=%i", &chanidx);
@@ -2229,11 +2229,12 @@ int get_modchannel_index(char *buf, int debug, void *vdata, telnet_printfunc_t p
   if (debug)
     LOG_I(UTIL, "%s received %s\n", __FUNCTION__, buf);
   webdatadef_t *tdata = (webdatadef_t *)vdata;
-  tdata->numlines = 0;
   if (strncmp(buf, "set", 3) == 0) {
     return get_channel_params(buf, debug, vdata, prnt);
   }
+  int numlines = 0;
   if (tdata != NULL) {
+    tdata->numlines = 0;
     for (int i = 0; i < max_chan; i++) {
       if (defined_channels[i] != NULL) {
         tdata->numlines++;
@@ -2245,8 +2246,9 @@ int get_modchannel_index(char *buf, int debug, void *vdata, telnet_printfunc_t p
     else {
       snprintf(tdata->tblname, sizeof(tdata->tblname) - 1, "No running model in the system");
     }
+    numlines = tdata->numlines;
   }
-  return tdata->numlines;
+  return numlines;
 } /* get_currentchannel_type */
 /*------------------------------------------------------------------------------------------------------------------*/