ham-ref/fldigi
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/fldigi synced 2026-08-13 17:47:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gcc-15 mods

Browse source 
* fixes required to compile without errors/warnings on
    gcc-15
This commit is contained in:
dave-w1hkj 2025-07-06 09:06:22 -05:00 • committed by dave-w1hkj
parent 146ca32833
commit 29bbc229ee
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/logbook/counties.cxx
View file

@ -413,7 +413,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
if (!OK) return answer;
ST = vec_7QP[n].ST;
for (size_t k = n; ST == vec_7QP[k].ST, k < vec_7QP.size(); k++) {
for (size_t k = n; k < vec_7QP.size(); k++) {
dCNTY = ucasestr(vec_7QP[k].CTY);
dCOUNTY = ucasestr(vec_7QP[k].county);
if (CNTY == dCNTY) {
@ -435,7 +435,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
if (!OK) return answer;
ST = vec_6QP[n].ST;
for (size_t k = n; ST == vec_6QP[k].ST, k < vec_6QP.size(); k++) {
for (size_t k = n; k < vec_6QP.size(); k++) {
dCNTY = ucasestr(vec_6QP[k].CTY);
dCOUNTY = ucasestr(vec_6QP[k].county);
if (CNTY == dCNTY) {
@ -457,7 +457,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
if (!OK) return answer;
ST = vec_SQSO[n].ST;
for (size_t k = n; ST == vec_SQSO[k].ST, k < vec_SQSO.size(); k++) {
for (size_t k = n; k < vec_SQSO.size(); k++) {
dCNTY = ucasestr(vec_SQSO[k].CTY);
dCOUNTY = ucasestr(vec_SQSO[k].county);
if (CNTY == dCNTY) {
@ -489,7 +489,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
if (ST != dST) return "";
ST = vec_7QP[n].ST;
for (size_t k = n; ST == vec_7QP[k].ST, k < vec_7QP.size(); k++) {
for (size_t k = n; k < vec_7QP.size(); k++) {
dCNTY = ucasestr(vec_7QP[k].CTY);
dCOUNTY = ucasestr(vec_7QP[k].county);
if (CNTY == dCNTY) return vec_7QP[k].county;
@ -504,7 +504,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
if (ST != dST) return "";
ST = vec_6QP[n].ST;
for (size_t k = n; ST == vec_6QP[k].ST, k < vec_6QP.size(); k++) {
for (size_t k = n; k < vec_6QP.size(); k++) {
if (vec_6QP[k].ST.empty()) return "";
dCNTY = ucasestr(vec_6QP[k].CTY);
dCOUNTY = ucasestr(vec_6QP[k].county);
@ -521,7 +521,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
if (ST != dST) return "";
ST = vec_SQSO[n].ST;
for (size_t k = n; ST == vec_SQSO[k].ST, k < vec_SQSO.size(); k++) {
for (size_t k = n; k < vec_SQSO.size(); k++) {
if (vec_SQSO[k].ST.empty()) return "";
dCNTY = ucasestr(vec_SQSO[k].CTY);
dCOUNTY = ucasestr(vec_SQSO[k].county);

11
src/logbook/table.cxx
View file

@ -1121,10 +1121,13 @@ int Table::handle(int event) {
// Create a tab separated list from data.
buffer = (char*)malloc(len);
if (buffer != nullptr) {
strcpy(buffer, tableRow[0]);
for (int col = 1; col < nCols; col++) {
strcat(buffer, "\t");
strcat(buffer, tableRow[col]);
for (int col = 0; col < nCols; col++) {
if (col == 0)
strcpy(buffer, tableRow[col]);
else
strcat(buffer, "\t");
strcat(buffer, tableRow[col]);
}
}
Fl::selection(*this, buffer, len);
free(buffer);

4
src/rigcontrol/hamlib.cxx
View file

@ -568,11 +568,7 @@ static void *hamlib_loop(void *args)
return NULL;
}
#ifdef RIGCAPS_NOT_CONST
static int add_to_list(struct rig_caps* rc, void*)
#else
static int add_to_list(const struct rig_caps* rc, void*)
#endif
{
hamlib_rigs.push_back(rc);
return 1;