From 43d16846ea6282ed8e869eb4ba056b321e675b3a Mon Sep 17 00:00:00 2001 From: Michael Black Date: Mon, 23 Mar 2020 07:51:43 -0500 Subject: [PATCH] Update idx_builtin to 64-bit indexes and fix cppcheck warning --- src/idx_builtin.h | 97 +++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 32 deletions(-) diff --git a/src/idx_builtin.h b/src/idx_builtin.h index 18eeb4990..0175e6ac9 100644 --- a/src/idx_builtin.h +++ b/src/idx_builtin.h @@ -37,38 +37,71 @@ * Of course, it can't work with setting2idx_builtin(RIG_LEVEL_XX|RIG_LEVEL_YY) */ -#define setting2idx_builtin(s) ((s)==(1<<0)?0: \ - (s)==(1<<1)?1: \ - (s)==(1<<2)?2: \ - (s)==(1<<3)?3: \ - (s)==(1<<4)?4: \ - (s)==(1<<5)?5: \ - (s)==(1<<6)?6: \ - (s)==(1<<7)?7: \ - (s)==(1<<8)?8: \ - (s)==(1<<9)?9: \ - (s)==(1<<10)?10: \ - (s)==(1<<11)?11: \ - (s)==(1<<12)?12: \ - (s)==(1<<13)?13: \ - (s)==(1<<14)?14: \ - (s)==(1<<15)?15: \ - (s)==(1<<16)?16: \ - (s)==(1<<17)?17: \ - (s)==(1<<18)?18: \ - (s)==(1<<19)?19: \ - (s)==(1<<20)?20: \ - (s)==(1<<21)?21: \ - (s)==(1<<22)?22: \ - (s)==(1<<23)?23: \ - (s)==(1<<24)?24: \ - (s)==(1<<25)?25: \ - (s)==(1<<26)?26: \ - (s)==(1<<27)?27: \ - (s)==(1<<28)?28: \ - (s)==(1<<29)?29: \ - (s)==(1<<30)?30: \ - (s)==(1<<31)?31: \ +// Note that 1<<0 is satisfied by the last clause here == 0 +#define setting2idx_builtin(s) ( \ + (s)==(1ull<<1)?1: \ + (s)==(1ull<<2)?2: \ + (s)==(1ull<<3)?3: \ + (s)==(1ull<<4)?4: \ + (s)==(1ull<<5)?5: \ + (s)==(1ull<<6)?6: \ + (s)==(1ull<<7)?7: \ + (s)==(1ull<<8)?8: \ + (s)==(1ull<<9)?9: \ + (s)==(1ull<<10)?10: \ + (s)==(1ull<<11)?11: \ + (s)==(1ull<<12)?12: \ + (s)==(1ull<<13)?13: \ + (s)==(1ull<<14)?14: \ + (s)==(1ull<<15)?15: \ + (s)==(1ull<<16)?16: \ + (s)==(1ull<<17)?17: \ + (s)==(1ull<<18)?18: \ + (s)==(1ull<<19)?19: \ + (s)==(1ull<<20)?20: \ + (s)==(1ull<<21)?21: \ + (s)==(1ull<<22)?22: \ + (s)==(1ull<<23)?23: \ + (s)==(1ull<<24)?24: \ + (s)==(1ull<<25)?25: \ + (s)==(1ull<<26)?26: \ + (s)==(1ull<<27)?27: \ + (s)==(1ull<<28)?28: \ + (s)==(1ull<<29)?29: \ + (s)==(1ull<<30)?30: \ + (s)==(1ull<<31)?31: \ + (s)==(1ull<<32)?32: \ + (s)==(1ull<<33)?33: \ + (s)==(1ull<<34)?34: \ + (s)==(1ull<<35)?35: \ + (s)==(1ull<<36)?36: \ + (s)==(1ull<<37)?37: \ + (s)==(1ull<<38)?38: \ + (s)==(1ull<<39)?39: \ + (s)==(1ull<<40)?40: \ + (s)==(1ull<<41)?41: \ + (s)==(1ull<<42)?42: \ + (s)==(1ull<<43)?43: \ + (s)==(1ull<<44)?44: \ + (s)==(1ull<<45)?45: \ + (s)==(1ull<<46)?46: \ + (s)==(1ull<<47)?47: \ + (s)==(1ull<<48)?48: \ + (s)==(1ull<<49)?49: \ + (s)==(1ull<<50)?50: \ + (s)==(1ull<<51)?51: \ + (s)==(1ull<<52)?52: \ + (s)==(1ull<<53)?53: \ + (s)==(1ull<<54)?54: \ + (s)==(1ull<<55)?55: \ + (s)==(1ull<<56)?56: \ + (s)==(1ull<<57)?57: \ + (s)==(1ull<<58)?58: \ + (s)==(1ull<<59)?59: \ + (s)==(1ull<<60)?60: \ + (s)==(1ull<<61)?61: \ + (s)==(1ull<<62)?62: \ + (s)==(1ull<<63)?63: \ 0 \ )