1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 18:07:59 +00:00

Slightly simplify crFinishFree{,V}.

They're only likely to be useful for freeing a coroutine state
structure, in which case there's no need to reset the line number
(since all such coroutines keep their line number in the state
structure) and the state structure pointer is always called "s".

[originally from svn r9632]
This commit is contained in:
Ben Harris 2012-08-27 18:44:06 +00:00
parent 0768c8557d
commit 475507e978

12
ssh.c
View File

@ -439,8 +439,8 @@ enum {
#define crState(t) crStateP(t, ssh->t) #define crState(t) crStateP(t, ssh->t)
#define crFinish(z) } *crLine = 0; return (z); } #define crFinish(z) } *crLine = 0; return (z); }
#define crFinishV } *crLine = 0; return; } #define crFinishV } *crLine = 0; return; }
#define crFinishFree(z, s) } *crLine = 0; sfree(s); return (z); } #define crFinishFree(z) } sfree(s); return (z); }
#define crFinishFreeV(s) } *crLine = 0; sfree(s); return; } #define crFinishFreeV } sfree(s); return; }
#define crReturn(z) \ #define crReturn(z) \
do {\ do {\
*crLine =__LINE__; return (z); case __LINE__:;\ *crLine =__LINE__; return (z); case __LINE__:;\
@ -7511,7 +7511,7 @@ static void ssh2_maybe_setup_x11(struct ssh_channel *c, struct Packet *pktin,
logevent("X11 forwarding refused"); logevent("X11 forwarding refused");
} }
} }
crFinishFreeV(s); crFinishFreeV;
} }
static void ssh2_maybe_setup_agent(struct ssh_channel *c, struct Packet *pktin, static void ssh2_maybe_setup_agent(struct ssh_channel *c, struct Packet *pktin,
@ -7542,7 +7542,7 @@ static void ssh2_maybe_setup_agent(struct ssh_channel *c, struct Packet *pktin,
logevent("Agent forwarding refused"); logevent("Agent forwarding refused");
} }
} }
crFinishFreeV(s); crFinishFreeV;
} }
static void ssh2_maybe_setup_pty(struct ssh_channel *c, struct Packet *pktin, static void ssh2_maybe_setup_pty(struct ssh_channel *c, struct Packet *pktin,
@ -7595,7 +7595,7 @@ static void ssh2_maybe_setup_pty(struct ssh_channel *c, struct Packet *pktin,
} else { } else {
ssh->editing = ssh->echoing = 1; ssh->editing = ssh->echoing = 1;
} }
crFinishFreeV(s); crFinishFreeV;
} }
static void ssh2_setup_env(struct ssh_channel *c, struct Packet *pktin, static void ssh2_setup_env(struct ssh_channel *c, struct Packet *pktin,
@ -7659,7 +7659,7 @@ static void ssh2_setup_env(struct ssh_channel *c, struct Packet *pktin,
} }
} }
out:; out:;
crFinishFreeV(s); crFinishFreeV;
} }
/* /*