Commit cf985460 authored by Robert Schmidt's avatar Robert Schmidt

getopt() returns int

See getopt(3): returns int, so store it in an int variable.
I went through all occurrences, project-wide. All return values of
getopt() should be stored in ints now.
parent 2c07f008
...@@ -340,7 +340,7 @@ int test_viterbi(uint8_t dabflag) ...@@ -340,7 +340,7 @@ int test_viterbi(uint8_t dabflag)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c; int c;
uint8_t dabflag=0; uint8_t dabflag=0;
while ((c = getopt (argc, argv, "d")) != -1) { while ((c = getopt (argc, argv, "d")) != -1) {
......
...@@ -567,7 +567,7 @@ void help (void) ...@@ -567,7 +567,7 @@ void help (void)
int main(int argc,char **argv) int main(int argc,char **argv)
{ {
char c,smbv_ip[16],smbv_fname[256]; char smbv_ip[16], smbv_fname[256];
extern char *optarg; extern char *optarg;
int i; int i;
...@@ -575,6 +575,7 @@ int main(int argc,char **argv) ...@@ -575,6 +575,7 @@ int main(int argc,char **argv)
strcpy(smbv_ip,DEFAULT_SMBV_IP); strcpy(smbv_ip,DEFAULT_SMBV_IP);
strcpy(smbv_fname,DEFAULT_SMBV_FNAME); strcpy(smbv_fname,DEFAULT_SMBV_FNAME);
int c;
while ((c = getopt (argc, argv, "hW:")) != -1) { while ((c = getopt (argc, argv, "hW:")) != -1) {
switch (c) { switch (c) {
case 'W': case 'W':
......
...@@ -461,9 +461,6 @@ void lte_param_init( unsigned char transmission_mode, ...@@ -461,9 +461,6 @@ void lte_param_init( unsigned char transmission_mode,
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int i,l,aa,aarx,sector; int i,l,aa,aarx,sector;
unsigned char pbch_pdu[6]; unsigned char pbch_pdu[6];
...@@ -504,6 +501,7 @@ int main(int argc, char **argv) ...@@ -504,6 +501,7 @@ int main(int argc, char **argv)
logInit(); logInit();
g_log->log_component[PHY].level = LOG_DEBUG; g_log->log_component[PHY].level = LOG_DEBUG;
int c;
while ((c = getopt (argc, argv, "hpFb:n:m:x:N:R:")) != -1) { while ((c = getopt (argc, argv, "hpFb:n:m:x:N:R:")) != -1) {
switch (c) { switch (c) {
case 'n': case 'n':
......
...@@ -57,7 +57,6 @@ int32_t dummy3[2048*14]; ...@@ -57,7 +57,6 @@ int32_t dummy3[2048*14];
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,l,aa; int i,l,aa;
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1; double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1;
uint8_t snr1set=0; uint8_t snr1set=0;
...@@ -104,6 +103,7 @@ int main(int argc, char **argv) { ...@@ -104,6 +103,7 @@ int main(int argc, char **argv) {
logInit(); logInit();
number_of_cards = 1; number_of_cards = 1;
int c;
while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:O:dP:")) != -1) { while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:O:dP:")) != -1) {
switch (c) { switch (c) {
case 'f': case 'f':
......
...@@ -374,7 +374,6 @@ DCI_PDU *get_dci(LTE_DL_FRAME_PARMS *lte_frame_parms,uint8_t log2L, uint8_t log2 ...@@ -374,7 +374,6 @@ DCI_PDU *get_dci(LTE_DL_FRAME_PARMS *lte_frame_parms,uint8_t log2L, uint8_t log2
extern int QPSK[4],QPSK2[4]; extern int QPSK[4],QPSK2[4];
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,l,aa; int i,l,aa;
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1; double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1;
int **txdata; int **txdata;
...@@ -425,6 +424,7 @@ int main(int argc, char **argv) { ...@@ -425,6 +424,7 @@ int main(int argc, char **argv) {
cpuf = get_cpu_freq_GHz(); cpuf = get_cpu_freq_GHz();
logInit(); logInit();
int c;
while ((c = getopt (argc, argv, "hapFg:R:c:n:s:x:y:z:L:M:N:I:f:i:S:P:Y")) != -1) { while ((c = getopt (argc, argv, "hapFg:R:c:n:s:x:y:z:L:M:N:I:f:i:S:P:Y")) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
......
...@@ -45,7 +45,6 @@ double cpuf; ...@@ -45,7 +45,6 @@ double cpuf;
void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe); void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,aa,aarx; int i,aa,aarx;
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1=0.0,ue_speed0=0.0,ue_speed1=0.0; double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1=0.0,ue_speed0=0.0,ue_speed1=0.0;
uint8_t snr1set=0; uint8_t snr1set=0;
...@@ -85,6 +84,7 @@ int main(int argc, char **argv) { ...@@ -85,6 +84,7 @@ int main(int argc, char **argv) {
logInit(); logInit();
number_of_cards = 1; number_of_cards = 1;
int c;
while ((c = getopt (argc, argv, "hHaA:Cr:p:g:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) { while ((c = getopt (argc, argv, "hHaA:Cr:p:g:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
......
...@@ -45,7 +45,6 @@ PHY_VARS_UE *UE; ...@@ -45,7 +45,6 @@ PHY_VARS_UE *UE;
double cpuf; double cpuf;
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,l,aa; int i,l,aa;
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1=0.0; double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1=0.0;
uint8_t snr1set=0; uint8_t snr1set=0;
...@@ -88,6 +87,7 @@ int main(int argc, char **argv) { ...@@ -88,6 +87,7 @@ int main(int argc, char **argv) {
number_of_cards = 1; number_of_cards = 1;
cpuf = get_cpu_freq_GHz(); cpuf = get_cpu_freq_GHz();
int c;
while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) { while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
......
...@@ -57,7 +57,6 @@ mod_sym_t dummy3[2048*14]; ...@@ -57,7 +57,6 @@ mod_sym_t dummy3[2048*14];
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,l,aa; int i,l,aa;
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1; double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1;
uint8_t snr1set=0; uint8_t snr1set=0;
...@@ -103,6 +102,7 @@ int main(int argc, char **argv) { ...@@ -103,6 +102,7 @@ int main(int argc, char **argv) {
number_of_cards = 1; number_of_cards = 1;
openair_daq_vars.rx_rf_mode = 1; openair_daq_vars.rx_rf_mode = 1;
int c;
while ((c = getopt (argc, argv, "f:hpf:g:n:s:S:t:x:y:z:N:F:GdP:")) != -1) { while ((c = getopt (argc, argv, "f:hpf:g:n:s:S:t:x:y:z:N:F:GdP:")) != -1) {
switch (c) { switch (c) {
case 'f': case 'f':
......
...@@ -304,7 +304,6 @@ void lte_param_init(unsigned char N_tx, unsigned char N_rx,unsigned char transmi ...@@ -304,7 +304,6 @@ void lte_param_init(unsigned char N_tx, unsigned char N_rx,unsigned char transmi
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c;
int i,iout,l,aa,aarx; int i,iout,l,aa,aarx;
double sigma2, sigma2_dB=0,SNR,snr0=10.0,snr1=11.0; double sigma2, sigma2_dB=0,SNR,snr0=10.0,snr1=11.0;
uint8_t snr1set=0; uint8_t snr1set=0;
...@@ -377,6 +376,7 @@ int main(int argc, char **argv) { ...@@ -377,6 +376,7 @@ int main(int argc, char **argv) {
rxdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES); rxdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
rxdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES); rxdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
*/ */
int c;
while ((c = getopt (argc, argv, "aehc:f:g:i:j:n:r:s:t:x:y:z:A:F:N:O:R:S:ZYDT:C:G:dB:U:u")) != -1) { while ((c = getopt (argc, argv, "aehc:f:g:i:j:n:r:s:t:x:y:z:A:F:N:O:R:S:ZYDT:C:G:dB:U:u")) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
......
...@@ -101,7 +101,6 @@ configmodule_interface_t *uniqCfg = NULL; ...@@ -101,7 +101,6 @@ configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int i; int i;
double SNR, SNR_lin, snr0 = -2.0, snr1 = 2.0; double SNR, SNR_lin, snr0 = -2.0, snr1 = 2.0;
double snr_step = 0.1; double snr_step = 0.1;
...@@ -146,6 +145,7 @@ int main(int argc, char **argv) ...@@ -146,6 +145,7 @@ int main(int argc, char **argv)
// logInit(); // logInit();
randominit(0); randominit(0);
int c;
while ((c = getopt(argc, argv, "--:O:df:hpVg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:L:X:")) != -1) { while ((c = getopt(argc, argv, "--:O:df:hpVg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:L:X:")) != -1) {
/* ignore long options starting with '--' and their arguments that are handled by configmodule */ /* ignore long options starting with '--' and their arguments that are handled by configmodule */
......
...@@ -177,7 +177,6 @@ void nr_phy_config_request_sim_pbchsim(PHY_VARS_gNB *gNB, ...@@ -177,7 +177,6 @@ void nr_phy_config_request_sim_pbchsim(PHY_VARS_gNB *gNB,
configmodule_interface_t *uniqCfg = NULL; configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int i,aa,start_symbol; int i,aa,start_symbol;
double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0; double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0;
double cfo=0; double cfo=0;
...@@ -246,6 +245,7 @@ int main(int argc, char **argv) ...@@ -246,6 +245,7 @@ int main(int argc, char **argv)
exit_fun("[NR_PBCHSIM] Error, configuration module init failed\n"); exit_fun("[NR_PBCHSIM] Error, configuration module init failed\n");
} }
int c;
while ((c = getopt (argc, argv, "--:O:c:F:g:hIL:m:M:n:N:o:P:r:R:s:S:x:y:z:")) != -1) { while ((c = getopt (argc, argv, "--:O:c:F:g:hIL:m:M:n:N:o:P:r:R:s:S:x:y:z:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -117,7 +117,6 @@ int NB_UE_INST = 1; ...@@ -117,7 +117,6 @@ int NB_UE_INST = 1;
configmodule_interface_t *uniqCfg = NULL; configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv){ int main(int argc, char **argv){
char c;
get_softmodem_params()->sl_mode = 0; get_softmodem_params()->sl_mode = 0;
double sigma2, sigma2_dB = 0, SNR, snr0 = -2.0, snr1 = 0.0, ue_speed0 = 0.0, ue_speed1 = 0.0; double sigma2, sigma2_dB = 0, SNR, snr0 = -2.0, snr1 = 0.0, ue_speed0 = 0.0, ue_speed1 = 0.0;
double **s_re, **s_im, **r_re, **r_im, iqim = 0.0, delay_avg = 0, ue_speed = 0, fs=-1, bw; double **s_re, **s_im, **r_re, **r_im, iqim = 0.0, delay_avg = 0, ue_speed = 0, fs=-1, bw;
...@@ -155,6 +154,7 @@ int main(int argc, char **argv){ ...@@ -155,6 +154,7 @@ int main(int argc, char **argv){
randominit(0); randominit(0);
int c;
while ((c = getopt (argc, argv, "--:O:hHaA:Cc:l:r:p:g:m:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) { while ((c = getopt (argc, argv, "--:O:hHaA:Cc:l:r:p:g:m:n:s:S:t:x:y:v:V:z:N:F:d:Z:L:R:E")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -315,7 +315,6 @@ double cpuf; ...@@ -315,7 +315,6 @@ double cpuf;
configmodule_interface_t *uniqCfg = NULL; configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int test_freqdomain_loopback = 0, test_slss_search = 0; int test_freqdomain_loopback = 0, test_slss_search = 0;
int frame = 5, slot = 10, frame_tx = 0, slot_tx = 0; int frame = 5, slot = 10, frame_tx = 0, slot_tx = 0;
int loglvl = OAILOG_INFO; int loglvl = OAILOG_INFO;
...@@ -343,6 +342,7 @@ int main(int argc, char **argv) ...@@ -343,6 +342,7 @@ int main(int argc, char **argv)
randominit(0); randominit(0);
int c;
while ((c = getopt(argc, argv, "--:O:c:hn:o:s:FIL:N:R:S:T:")) != -1) { while ((c = getopt(argc, argv, "--:O:c:hn:o:s:FIL:N:R:S:T:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -97,7 +97,6 @@ nrUE_params_t *get_nrUE_params(void) { ...@@ -97,7 +97,6 @@ nrUE_params_t *get_nrUE_params(void) {
configmodule_interface_t *uniqCfg = NULL; configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int i;//,l; int i;//,l;
double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0; double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0;
double cfo=0; double cfo=0;
...@@ -155,6 +154,7 @@ int main(int argc, char **argv) ...@@ -155,6 +154,7 @@ int main(int argc, char **argv)
randominit(0); randominit(0);
logInit(); logInit();
int c;
while ((c = getopt (argc, argv, "--:O:f:hA:f:g:i:I:P:B:b:t:T:m:n:r:o:s:S:x:y:z:N:F:GR:IL:q:cd:")) != -1) { while ((c = getopt (argc, argv, "--:O:f:hA:f:g:i:I:P:B:b:t:T:m:n:r:o:s:S:x:y:z:N:F:GR:IL:q:cd:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -121,7 +121,6 @@ nrUE_params_t *get_nrUE_params(void) { ...@@ -121,7 +121,6 @@ nrUE_params_t *get_nrUE_params(void) {
configmodule_interface_t *uniqCfg = NULL; configmodule_interface_t *uniqCfg = NULL;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char c;
int i; int i;
double SNR, snr0 = -2.0, snr1 = 2.0, SNR_lin; double SNR, snr0 = -2.0, snr1 = 2.0, SNR_lin;
double snr_step = 0.1; double snr_step = 0.1;
...@@ -165,7 +164,7 @@ int main(int argc, char **argv) ...@@ -165,7 +164,7 @@ int main(int argc, char **argv)
//logInit(); //logInit();
randominit(0); randominit(0);
//while ((c = getopt(argc, argv, "--:df:hpg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:")) != -1) { int c;
while ((c = getopt(argc, argv, "--:O:hg:n:s:S:py:z:M:N:R:F:m:l:q:r:W:")) != -1) { while ((c = getopt(argc, argv, "--:O:hg:n:s:S:py:z:M:N:R:F:m:l:q:r:W:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -145,7 +145,6 @@ int main(int argc, char *argv[]) ...@@ -145,7 +145,6 @@ int main(int argc, char *argv[])
{ {
FILE *csv_file = NULL; FILE *csv_file = NULL;
char *filename_csv = NULL; char *filename_csv = NULL;
char c;
int i; int i;
double SNR, snr0 = -2.0, snr1 = 2.0; double SNR, snr0 = -2.0, snr1 = 2.0;
double sigma, sigma_dB; double sigma, sigma_dB;
...@@ -224,6 +223,7 @@ int main(int argc, char *argv[]) ...@@ -224,6 +223,7 @@ int main(int argc, char *argv[])
/* initialize the sin-cos table */ /* initialize the sin-cos table */
InitSinLUT(); InitSinLUT();
int c;
while ((c = getopt(argc, argv, "--:O:a:b:c:d:ef:g:h:i:k:m:n:op:q:r:s:t:u:v:w:y:z:C:F:G:H:I:M:N:PR:S:T:U:L:ZW:E:X:")) != -1) { while ((c = getopt(argc, argv, "--:O:a:b:c:d:ef:g:h:i:k:m:n:op:q:r:s:t:u:v:w:y:z:C:F:G:H:I:M:N:PR:S:T:U:L:ZW:E:X:")) != -1) {
/* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */ /* ignore long options starting with '--', option '-O' and their arguments that are handled by configmodule */
......
...@@ -423,7 +423,7 @@ usage (void) { ...@@ -423,7 +423,7 @@ usage (void) {
int int
get_options (int argc, char *argv[]) { get_options (int argc, char *argv[]) {
int node_t; int node_t;
char tag; int tag;
while ((tag = while ((tag =
getopt (argc, argv, getopt (argc, argv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment