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

Normalize some debug/trace output. 

Make spaces(len) actually return a string of length 'len', not len + 1.
Eliminate static writable memory and a 256 byte write on each debug/trace
 call.
Make the depth stars line up.
pull/1557/head
George Baltz N3GB 2024-05-27 20:31:46 -04:00
rodzic 18568986f8
commit f53dc99057
2 zmienionych plików z 10 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
include/hamlib/rig.h
Wyświetl plik

@ -33,7 +33,7 @@
// Our shared secret password // Our shared secret password
#define HAMLIB_SECRET_LENGTH 32 #define HAMLIB_SECRET_LENGTH 32
#define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%s%s(%d) trace\n",spaces(rig->state.depth-1), __FILE__, __LINE__) #define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%s%s(%d) trace\n",spaces(rig->state.depth), __FILE__, __LINE__)
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
#include <stdio.h> #include <stdio.h>
@ -3738,7 +3738,7 @@ extern HAMLIB_EXPORT_VAR(char) debugmsgsave3[DEBUGMSGSAVE_SIZE]; // last-2 debu
// Measuring elapsed time -- local variable inside function when macro is used // Measuring elapsed time -- local variable inside function when macro is used
#define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET); #define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET);
#define ELAPSED2 rig_debug(RIG_DEBUG_VERBOSE, "%s%d:%s: elapsed=%.0lfms\n", spaces(rig->state.depth-1), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET)); #define ELAPSED2 rig_debug(RIG_DEBUG_VERBOSE, "%s%d:%s: elapsed=%.0lfms\n", spaces(rig->state.depth), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET));
// use this instead of snprintf for automatic detection of buffer limit // use this instead of snprintf for automatic detection of buffer limit
#define SNPRINTF(s,n,...) { snprintf(s,n,##__VA_ARGS__);if (strlen(s) > n-1) fprintf(stderr,"****** %s(%d): buffer overflow ******\n", __func__, __LINE__); } #define SNPRINTF(s,n,...) { snprintf(s,n,##__VA_ARGS__);if (strlen(s) > n-1) fprintf(stderr,"****** %s(%d): buffer overflow ******\n", __func__, __LINE__); }

21
src/misc.c
Wyświetl plik

@ -2857,26 +2857,21 @@ char *rig_date_strget(char *buf, int buflen, int localtime)
return date_strget(buf, buflen, localtime); return date_strget(buf, buflen, localtime);
} }
#define MAX_SPACES 256
const char *spaces(int len) const char *spaces(int len)
{ {
static char s[256]; static const char s[MAX_SPACES + 1] =
memset(s, '*', sizeof(s)); "****************************************************************"
"****************************************************************"
"****************************************************************"
"****************************************************************";
if (len > 255) if (len < 0 || len > MAX_SPACES)
{ {
len = 0; len = 0;
} }
if (len > 0) return &s[MAX_SPACES - len];
{
s[len + 1] = 0;
}
else
{
s[1] = 0;
}
return s;
} }
// if which==0 rig_band_select str will be returned // if which==0 rig_band_select str will be returned