mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Use terminating 0 rather than hardcoded array size

pull/2/head
Daniel Richman 2011-11-13 17:01:17 +00:00
rodzic 4b1d4b4dc6
commit 08d57c21df
2 zmienionych plików z 9 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/cw_rtty/rtty.cxx
Wyświetl plik

@ -92,8 +92,9 @@ int dspcnt = 0;
static char msg1[20];
const double rtty::SHIFT[] = {23, 85, 160, 170, 182, 200, 240, 350, 425, 600, 850};
const double rtty::BAUD[] = {45, 45.45, 50, 56, 75, 100, 110, 150, 200, 300, 600, 1200};
/* Terminating 0 at the end of the list for dl_fldigi.cxx */
const double rtty::SHIFT[] = {23, 85, 160, 170, 182, 200, 240, 350, 425, 600, 850, 0};
const double rtty::BAUD[] = {45, 45.45, 50, 56, 75, 100, 110, 150, 200, 300, 600, 1200, 0};
const int rtty::BITS[] = {5, 7, 8};
void rtty::tx_init(SoundBase *sc)

15
src/dl_fldigi/dl_fldigi.cxx
Wyświetl plik

@ -938,10 +938,8 @@ void auto_configure()
double shift = settings["shift"].asDouble();
/* Look in the standard shifts first */
/* hardcoded list size :-( */
int stdshifts = 11;
int search;
for (search = 0; search < stdshifts; search++)
for (search = 0; rtty::SHIFT[search] != 0; search++)
{
double diff = rtty::SHIFT[search] - shift;
/* I love floats :-( */
@ -954,11 +952,11 @@ void auto_configure()
}
}
/* If not found, search == stdshifts, which is the index of
* the "Custom" menu item */
if (search == stdshifts)
/* If not found (i.e., we found the terminating 0) then
* search == the index of the "Custom" menu item */
if (rtty::SHIFT[search] == 0)
{
selShift->value(stdshifts);
selShift->value(search);
selCustomShift->activate();
progdefaults.rtty_shift = -1;
selCustomShift->value(shift);
@ -972,9 +970,8 @@ void auto_configure()
if (settings["baud"].isNumeric())
{
double baud = settings["baud"].asDouble();
int stdbauds = 12;
int search;
for (search = 0; search < stdbauds; search++)
for (search = 0; rtty::BAUD[search] != 0; search++)
{
double diff = rtty::BAUD[search] - baud;
if (diff < 0.01 && diff > -0.01)