nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-18 19:41:01 -05:00
Code Issues Projects Releases Wiki Activity

Start using C99 variadic macros.

Browse Source 
In the past, I've had a lot of macros which you call with double
parentheses, along the lines of debug(("format string", params)), so
that the inner parens protect the commas and permit the macro to treat
the whole printf-style argument list as one macro argument.

That's all very well, but it's a bit inconvenient (it doesn't leave
you any way to implement such a macro by prepending another argument
to the list), and now this code base's rules allow C99isms, I can
switch all those macros to using a single pair of parens, using the
C99 ability to say '...' in the parameter list of the #define and get
at the corresponding suffix of the arguments as __VA_ARGS__.

So I'm doing it. I've made the following printf-style macros variadic:
bpp_logevent, ppl_logevent, ppl_printf and debug.

While I'm here, I've also fixed up a collection of conditioned-out
calls to debug() in the Windows front end which were clearly expecting
a macro with a different calling syntax, because they had an integer
parameter first. If I ever have a need to condition those back in,
they should actually work now.
This commit is contained in:
Simon Tatham
2018-12-08 20:32:31 +00:00
parent 383a16d5e5
commit e08641c912
26 changed files with 525 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
windows/winpgnt.c
View File

@ -794,7 +794,7 @@ static char *answer_filemapping_message(const char *mapname)
reply.buf = NULL;
#ifdef DEBUG_IPC
debug(("mapname = \"%s\"\n", mapname));
debug("mapname = \"%s\"\n", mapname);
#endif
maphandle = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, mapname);
@ -805,7 +805,7 @@ static char *answer_filemapping_message(const char *mapname)
}
#ifdef DEBUG_IPC
debug(("maphandle = %p\n", maphandle));
debug("maphandle = %p\n", maphandle);
#endif
#ifndef NO_SECURITY
@ -837,8 +837,8 @@ static char *answer_filemapping_message(const char *mapname)
ConvertSidToStringSid(mapsid, &theirs);
ConvertSidToStringSid(expectedsid, &ours);
ConvertSidToStringSid(expectedsid_bc, &ours2);
debug(("got sids:\n oursnew=%s\n oursold=%s\n"
" theirs=%s\n", ours, ours2, theirs));
debug("got sids:\n oursnew=%s\n oursold=%s\n"
" theirs=%s\n", ours, ours2, theirs);
LocalFree(ours);
LocalFree(ours2);
LocalFree(theirs);
@ -854,7 +854,7 @@ static char *answer_filemapping_message(const char *mapname)
#endif /* NO_SECURITY */
{
#ifdef DEBUG_IPC
debug(("security APIs not present\n"));
debug("security APIs not present\n");
#endif
}
@ -866,7 +866,7 @@ static char *answer_filemapping_message(const char *mapname)
}
#ifdef DEBUG_IPC
debug(("mapped address = %p\n", mapaddr));
debug("mapped address = %p\n", mapaddr);
#endif
{
@ -887,7 +887,7 @@ static char *answer_filemapping_message(const char *mapname)
mapsize = mbi.RegionSize;
}
#ifdef DEBUG_IPC
debug(("region size = %zd\n", mapsize));
debug("region size = %zd\n", mapsize);
#endif
if (mapsize < 5) {
err = dupstr("mapping smaller than smallest possible request");
@ -897,8 +897,8 @@ static char *answer_filemapping_message(const char *mapname)
msglen = GET_32BIT((unsigned char *)mapaddr);
#ifdef DEBUG_IPC
debug(("msg length=%08x, msg type=%02x\n",
msglen, (unsigned)((unsigned char *) mapaddr)[4]));
debug("msg length=%08x, msg type=%02x\n",
msglen, (unsigned)((unsigned char *) mapaddr)[4]);
#endif
reply.buf = (char *)mapaddr + 4;
@ -1095,7 +1095,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
err = answer_filemapping_message(mapname);
if (err) {
#ifdef DEBUG_IPC
debug(("IPC failed: %s\n", err));
debug("IPC failed: %s\n", err);
#endif
sfree(err);
return 0;