mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 09:27:59 +00:00
8d186c3c93
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
|
||
|---|---|---|
| .. | ||
| configure | ||
| gtkapp.c | ||
| gtkask.c | ||
| gtkcfg.c | ||
| gtkcols.c | ||
| gtkcols.h | ||
| gtkcomm.c | ||
| gtkcompat.h | ||
| gtkdlg.c | ||
| gtkfont.c | ||
| gtkfont.h | ||
| gtkmain.c | ||
| gtkmisc.c | ||
| gtkmisc.h | ||
| gtkwin.c | ||
| osxlaunch.c | ||
| procnet.c | ||
| pterm.bundle | ||
| pterm.plist | ||
| putty.bundle | ||
| putty.plist | ||
| unix.h | ||
| ux_x11.c | ||
| uxagentc.c | ||
| uxagentsock.c | ||
| uxcfg.c | ||
| uxcliloop.c | ||
| uxcons.c | ||
| uxfdsock.c | ||
| uxgen.c | ||
| uxgss.c | ||
| uxmisc.c | ||
| uxnet.c | ||
| uxnogtk.c | ||
| uxnoise.c | ||
| uxpeer.c | ||
| uxpgnt.c | ||
| uxplink.c | ||
| uxpoll.c | ||
| uxprint.c | ||
| uxproxy.c | ||
| uxpterm.c | ||
| uxpty.c | ||
| uxputty.c | ||
| uxsel.c | ||
| uxser.c | ||
| uxserver.c | ||
| uxsftp.c | ||
| uxsftpserver.c | ||
| uxshare.c | ||
| uxsignal.c | ||
| uxstore.c | ||
| uxucs.c | ||
| uxutils.c | ||
| x11misc.c | ||
| x11misc.h | ||
| xkeysym.c | ||
| xpmptcfg.c | ||
| xpmpterm.c | ||
| xpmpucfg.c | ||
| xpmputty.c | ||