Merge remote-tracking branch 'origin/fix-config-module' into integration_2022_wk33

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -658,10 +658,10 @@ int main(int argc, char **argv)
 
 	if (ouput_vcd)
         vcd_signal_dumper_close();
+    end_configmodule();
+    loader_reset();
+    logTerm();
 
-  loader_reset();
-  logTerm();
-
-	return (n_errors);
+    return (n_errors);
 }
 

openair1/SIMULATION/TOOLS/random_channel.c

@@ -62,7 +62,7 @@ static double snr_dB=25;
 static double sinr_dB=0;
 static unsigned int max_chan;
 static channel_desc_t **defined_channels;
-static char modellist_name[MAX_OPTNAME_SIZE]= {0};
+static char *modellist_name;
 
 
 void fill_channel_desc(channel_desc_t *chan_desc,

openair1/SIMULATION/TOOLS/sim.h

@@ -253,7 +253,7 @@ typedef enum {
     {"s"      ,     CONFIG_HLP_SNR,                                     PARAMFLAG_CMDLINE_NOPREFIXENABLED,   dblptr:&snr_dB,                        defdblval:25,                    TYPE_DOUBLE, 0},\
     {"sinr_dB",     NULL,                                               0,                                   dblptr:&sinr_dB,                       defdblval:0 ,                    TYPE_DOUBLE, 0},\
     {"max_chan",    "Max number of runtime models",                     0,                                   uptr:&max_chan,                        defintval:10,                    TYPE_UINT,   0},\
-    {CHANNELMOD_MODELLIST_PARANAME, CHANNELMOD_HELP_MODELLIST,          0,                                   strptr:(char **)&modellist_name,       defstrval:"DefaultChannelList",  TYPE_STRING, 60 },\
+    {CHANNELMOD_MODELLIST_PARANAME, CHANNELMOD_HELP_MODELLIST,          0,                                   strptr:&modellist_name,       defstrval:"DefaultChannelList",  TYPE_STRING, 0},\
   }
 
 /* parameters for one model */