diff --git a/app/qtapp/rtknavi_qt/mondlg.cpp b/app/qtapp/rtknavi_qt/mondlg.cpp index 158d53547..277809a6c 100644 --- a/app/qtapp/rtknavi_qt/mondlg.cpp +++ b/app/qtapp/rtknavi_qt/mondlg.cpp @@ -1065,7 +1065,7 @@ void MonitorDialog::setObservations() //--------------------------------------------------------------------------- void MonitorDialog::showObservations() { - char tstr[40], id[8], *code; + char tstr[40], id[8]; int i, k, n = 0, nex = ui->cBSelectObservation->currentIndex() ? NEXOBS : 0; int sys = sys_tbl[ui->cBSelectNavigationSystems->currentIndex()]; int std = ui->cBSelectObservation->currentIndex(); @@ -1107,7 +1107,7 @@ void MonitorDialog::showObservations() ui->tWConsole->item(i, j++)->setText(id); ui->tWConsole->item(i, j++)->setText(QString("(%1)").arg(obs[i].rcv)); for (k = 0; k < NFREQ + nex; k++) { - code = code2obs(obs[i].code[k]); + const char *code = code2obs(obs[i].code[k]); if (*code) ui->tWConsole->item(i, j++)->setText(code); else ui->tWConsole->item(i, j++)->setText("-"); } diff --git a/app/qtapp/rtkplot_qt/plotinfo.cpp b/app/qtapp/rtkplot_qt/plotinfo.cpp index 52071029b..8c3acd8bf 100644 --- a/app/qtapp/rtkplot_qt/plotinfo.cpp +++ b/app/qtapp/rtkplot_qt/plotinfo.cpp @@ -382,7 +382,6 @@ static int _strcmp(const void *str1, const void *str2) // update observation type pull-down menu -------------------------------------- void Plot::updateObservationType() { - char *codes[MAXCODE + 1], *obs; int i, j, n = 0, codeMask[MAXCODE + 1] = { 0 }; trace(3, "updateObservationType\n"); @@ -393,9 +392,11 @@ void Plot::updateObservationType() codeMask[observation.data[i].code[j]] = 1; // count codes + const char *codes[MAXCODE + 1]; for (uint8_t c = 1; c <= MAXCODE; c++) { if (!codeMask[c]) continue; - if (!*(obs = code2obs(c))) continue; + const char *obs = code2obs(c); + if (!*obs) continue; codes[n++] = obs; } qsort(codes, n, sizeof(char *), _strcmp); diff --git a/app/winapp/rtknavi/mondlg.cpp b/app/winapp/rtknavi/mondlg.cpp index 51897b931..e7998d1dc 100644 --- a/app/winapp/rtknavi/mondlg.cpp +++ b/app/winapp/rtknavi/mondlg.cpp @@ -991,7 +991,7 @@ void __fastcall TMonitorDialog::SetObs(void) void __fastcall TMonitorDialog::ShowObs(void) { AnsiString s; - char tstr[40],id[8],*code; + char tstr[40],id[8]; int i,j,k,n=0,nex=ObsMode?NEXOBS:0,sys=sys_tbl[SelSys->ItemIndex]; obsd_t *obs = static_cast(calloc(MAXOBS * 2, sizeof(obsd_t))); @@ -1023,7 +1023,7 @@ void __fastcall TMonitorDialog::ShowObs(void) Tbl->Cells[j++][i+1]=id; Tbl->Cells[j++][i+1]=s.sprintf("(%d)",obs[i].rcv); for (k=0;kCells[j++][i+1]=s.sprintf("%s",code); else Tbl->Cells[j++][i+1]="-"; } diff --git a/app/winapp/rtkplot/plotinfo.cpp b/app/winapp/rtkplot/plotinfo.cpp index 54255fde0..28be1e407 100644 --- a/app/winapp/rtkplot/plotinfo.cpp +++ b/app/winapp/rtkplot/plotinfo.cpp @@ -333,7 +333,6 @@ static int _strcmp(const void *str1, const void *str2) void __fastcall TPlot::UpdateObsType(void) { UTF8String s; - char *obs,*codes[MAXCODE+1]; int i,j,n=0,cmask[MAXCODE+1]={0},fmask[10]={0}; const char *obstypes[] = {"L1/LC","L2/E5b","L5/E5a","L6","L7","L8"}; @@ -342,9 +341,11 @@ void __fastcall TPlot::UpdateObsType(void) for (i=0;i