On Tue, Nov 22, 2022 at 2:19 AM Amir Goldstein <amir73il@xxxxxxxxx> wrote: > > I hope there is a better way than this macro... > Haven't studied the patches enough to be able to suggest one. > > Thanks, > Amir. I'm certainly open to suggestions there. Currently the main thing stopping us from moving away from that macro are the four functions/var args we pass in. We've thought about alternatives there, but we haven't found one we like so far. Since we've refactored all the uses of the macro into function calls, we can avoid most of it now. The ugliest bit would be moving the var args into a struct and passing it in as a void*. Then we could have all the function signatures match and pass them as function pointers. The remaining things we use the macro for could either be pushed into the struct, or extra boilerplate around the function call.