Do not show any debug trace messages unless requested with -vvvvv

This fixes the following commands that always printed debug messages
at the trace level:
 tests/ampctld -l >/dev/null
 tests/ampctl -h >/dev/null
 tests/rigctld -l >/dev/null
 tests/rigctltcp -l >/dev/null
 tests/rotctld -l >/dev/null
It doesn't affect other software which worked around this issue,
but changes all software to avoid regressions in future.

Test case (should print nothing in bash):
{
tests/ampctl -l -h
tests/ampctld -l -h
tests/rigctl -l -h
tests/rigctlcom -l -h
tests/rigctld -l -h
tests/rigctlsync -l -h
tests/rigctltcp -l -h
tests/rotctl -l -h
tests/rotctld -l -h
} >/dev/null
pull/1850/head
Daniele Forsi IU5HKX 2025-08-20 16:22:39 +02:00
rodzic 5a001ab3aa
commit cbefd0835f
12 zmienionych plików z 24 dodań i 25 usunięć

Wyświetl plik

@ -132,6 +132,7 @@ int main(int argc, char *argv[])
int serial_rate = 0;
char conf_parms[MAXCONFLEN] = "";
rig_set_debug(verbose);
while (1)
{
int c;
@ -216,6 +217,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -223,7 +225,6 @@ int main(int argc, char *argv[])
break;
case 'l':
rig_set_debug(0);
list_models();
exit(0);
@ -241,8 +242,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -179,6 +179,7 @@ int main(int argc, char *argv[])
#endif
#endif
rig_set_debug(verbose);
while (1)
{
int c;
@ -245,6 +246,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -269,8 +271,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -240,6 +240,7 @@ int main(int argc, char *argv[])
if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
rig_set_debug(verbose);
while (1)
{
int c;
@ -438,6 +439,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -445,7 +447,6 @@ int main(int argc, char *argv[])
break;
case 'l':
rig_set_debug(verbose);
list_models();
exit(0);
@ -467,8 +468,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }

Wyświetl plik

@ -227,6 +227,7 @@ int main(int argc, char *argv[])
printf("rigctlcom Version 1.6\n");
rig_set_debug(verbose);
while (1)
{
int c;
@ -379,6 +380,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -386,7 +388,6 @@ int main(int argc, char *argv[])
break;
case 'l':
rig_set_debug(verbose);
list_models();
exit(0);
@ -404,8 +405,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "%s, %s\n", "rigctlcom", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -288,7 +288,7 @@ int main(int argc, char *argv[])
if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
rig_set_debug(verbose);
while (1)
{
int c;
@ -494,6 +494,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -546,8 +547,6 @@ int main(int argc, char *argv[])
#endif
rig_set_debug(verbose);
SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }

Wyświetl plik

@ -215,6 +215,7 @@ int main(int argc, char *argv[])
printf("rigctlsync Version 1.0\n");
rig_set_debug(verbose);
while (1)
{
int c;
@ -388,6 +389,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -395,7 +397,6 @@ int main(int argc, char *argv[])
break;
case 'l':
rig_set_debug(verbose);
list_models();
exit(0);
@ -413,8 +414,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "%s, %s\n", "rigctlsync", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -289,7 +289,7 @@ int main(int argc, char *argv[])
if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
rig_set_debug(verbose);
while (1)
{
int c;
@ -481,6 +481,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -548,8 +549,6 @@ int main(int argc, char *argv[])
#endif
rig_set_debug(verbose);
SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }

Wyświetl plik

@ -105,6 +105,7 @@ int main(int argc, char *argv[])
char conf_parms[MAXCONFLEN] = "";
extern char csv_sep;
rig_set_debug(verbose);
while (1)
{
int c;
@ -182,6 +183,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
default:

Wyświetl plik

@ -89,6 +89,7 @@ int main(int argc, char *argv[])
elevation_t elevation;
unsigned step = 1000000; /* 1e6 us */
rig_set_debug(verbose);
while (1)
{
int c;
@ -172,6 +173,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
default:

Wyświetl plik

@ -79,6 +79,7 @@ int main(int argc, char *argv[])
freq_t step = kHz(100);
value_t pwr;
rig_set_debug(verbose);
while (1)
{
int c;
@ -173,6 +174,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
default:

Wyświetl plik

@ -140,6 +140,7 @@ int main(int argc, char *argv[])
azimuth_t az_offset = 0;
elevation_t el_offset = 0;
rig_set_debug(verbose);
while (1)
{
int c;
@ -237,6 +238,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -244,7 +246,6 @@ int main(int argc, char *argv[])
break;
case 'l':
rig_set_debug(0);
list_models();
exit(0);
@ -262,8 +263,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -172,6 +172,7 @@ int main(int argc, char *argv[])
#endif
struct handle_data *arg;
rig_set_debug(verbose);
while (1)
{
int c;
@ -250,6 +251,7 @@ int main(int argc, char *argv[])
case 'v':
verbose++;
rig_set_debug(verbose);
break;
case 'L':
@ -274,8 +276,6 @@ int main(int argc, char *argv[])
}
}
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");