From a33f1b7920ab5b9633c55255d8f4194862c8481e Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 31 Jan 2022 08:34:06 -0600 Subject: [PATCH] Add ENTERFUNC2 and RETURNFUN2 for functions that don't have rig structure --- src/misc.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/misc.h b/src/misc.h index f755c56cf..6a5c66b18 100644 --- a/src/misc.h +++ b/src/misc.h @@ -159,6 +159,8 @@ void errmsg(int err, char *s, const char *func, const char *file, int line); #define ENTERFUNC { ++rig->state.depth; \ rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s entered\n", rig->state.depth, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__); \ } +#define ENTERFUNC2 { rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s entered\n", __FILENAME__, __LINE__, __func__); \ + } // we need to refer to rc just once as it // could be a function call #define RETURNFUNC(rc) {do { \ @@ -167,6 +169,11 @@ void errmsg(int err, char *s, const char *func, const char *file, int line); --rig->state.depth; \ return (rctmp); \ } while(0);} +#define RETURNFUNC2(rc) {do { \ + int rctmp = rc; \ + rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s return(%ld) %s\n", __FILENAME__, __LINE__, __func__, (long int) (rctmp), rctmp<0?rigerror(rctmp):""); \ + return (rctmp); \ + } while(0);} #define CACHE_RESET {\ elapsed_ms(&rig->state.cache.time_freqMainA, HAMLIB_ELAPSED_INVALIDATE);\