nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-31 02:32:49 -05:00
Code Issues Projects Releases Wiki Activity

Formatting: fix a few mis-spaced assignments.

Browse Source 
I spotted one of those in the raw backend the other day, and now I've
got round to finding a bunch more and fixing them.
This commit is contained in:
Simon Tatham 2022-12-28 15:28:36 +00:00
parent 9f2e1e6e03
commit 6fcc7ed728
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
otherbackends/raw.c
View File

@ -91,7 +91,7 @@ static void raw_closing(Plug *plug, PlugCloseType type, const char *error_msg)
if (!raw->sent_socket_eof) { if (!raw->sent_socket_eof) {
if (raw->s) if (raw->s)
sk_write_eof(raw->s); sk_write_eof(raw->s);
raw->sent_socket_eof= true; raw->sent_socket_eof = true;
} }
} }
raw->sent_console_eof = true; raw->sent_console_eof = true;
@ -287,7 +287,7 @@ static void raw_special(Backend *be, SessionSpecialCode code, int arg)
if (code == SS_EOF && raw->s) { if (code == SS_EOF && raw->s) {
if (!raw->sent_socket_eof) if (!raw->sent_socket_eof)
sk_write_eof(raw->s); sk_write_eof(raw->s);
raw->sent_socket_eof= true; raw->sent_socket_eof = true;
raw_check_close(raw); raw_check_close(raw);
} }

2
pageant.c
View File

@ -1683,7 +1683,7 @@ void pageant_reencrypt_all(void)
#define crGetChar(c) do \ #define crGetChar(c) do \
{ \ { \
while (len == 0) { \ while (len == 0) { \
*crLine =__LINE__; return; case __LINE__:; \ *crLine = __LINE__; return; case __LINE__:; \
} \ } \
len--; \ len--; \
(c) = (unsigned char)*data++; \ (c) = (unsigned char)*data++; \

2
ssh/sharing.c
View File

@ -1742,7 +1742,7 @@ static void share_got_pkt_from_downstream(struct ssh_sharing_connstate *cs,
#define crGetChar(c) do \ #define crGetChar(c) do \
{ \ { \
while (len == 0) { \ while (len == 0) { \
*crLine =__LINE__; return; case __LINE__:; \ *crLine = __LINE__; return; case __LINE__:; \
} \ } \
len--; \ len--; \
(c) = (unsigned char)*data++; \ (c) = (unsigned char)*data++; \

10
sshcr.h
View File

@ -39,7 +39,7 @@
#define crFinishFreeV } sfree(s); return; } while (0) #define crFinishFreeV } sfree(s); return; } while (0)
#define crReturn(z) \ #define crReturn(z) \
do {\ do {\
*crLine =__LINE__; return (z); case __LINE__:;\ *crLine = __LINE__; return (z); case __LINE__:;\
} while (0) } while (0)
#define crReturnV \ #define crReturnV \
do {\ do {\
@ -64,22 +64,22 @@
*/ */
#define crMaybeWaitUntil(c) \ #define crMaybeWaitUntil(c) \
do { \ do { \
*crLine =__LINE__; \ *crLine = __LINE__; \
case __LINE__: if (!(c)) return 0; \ case __LINE__: if (!(c)) return 0; \
} while (0) } while (0)
#define crMaybeWaitUntilV(c) \ #define crMaybeWaitUntilV(c) \
do { \ do { \
*crLine =__LINE__; \ *crLine = __LINE__; \
case __LINE__: if (!(c)) return; \ case __LINE__: if (!(c)) return; \
} while (0) } while (0)
#define crWaitUntil(c) \ #define crWaitUntil(c) \
do { \ do { \
*crLine =__LINE__; return; \ *crLine = __LINE__; return; \
case __LINE__: if (!(c)) return 0; \ case __LINE__: if (!(c)) return 0; \
} while (0) } while (0)
#define crWaitUntilV(c) \ #define crWaitUntilV(c) \
do { \ do { \
*crLine =__LINE__; return; \ *crLine = __LINE__; return; \
case __LINE__: if (!(c)) return; \ case __LINE__: if (!(c)) return; \
} while (0) } while (0)

12
windows/gss.c
View File

@ -451,8 +451,8 @@ static Ssh_gss_stat ssh_sspi_init_sec_context(struct ssh_gss_library *lib,
winSsh_gss_ctx *winctx = (winSsh_gss_ctx *) *ctx; winSsh_gss_ctx *winctx = (winSsh_gss_ctx *) *ctx;
SecBuffer wsend_tok = {send_tok->length,SECBUFFER_TOKEN,send_tok->value}; SecBuffer wsend_tok = {send_tok->length,SECBUFFER_TOKEN,send_tok->value};
SecBuffer wrecv_tok = {recv_tok->length,SECBUFFER_TOKEN,recv_tok->value}; SecBuffer wrecv_tok = {recv_tok->length,SECBUFFER_TOKEN,recv_tok->value};
SecBufferDesc output_desc={SECBUFFER_VERSION,1,&wsend_tok}; SecBufferDesc output_desc = {SECBUFFER_VERSION,1,&wsend_tok};
SecBufferDesc input_desc ={SECBUFFER_VERSION,1,&wrecv_tok}; SecBufferDesc input_desc = {SECBUFFER_VERSION,1,&wrecv_tok};
unsigned long flags=ISC_REQ_MUTUAL_AUTH|ISC_REQ_REPLAY_DETECT| unsigned long flags=ISC_REQ_MUTUAL_AUTH|ISC_REQ_REPLAY_DETECT|
ISC_REQ_CONFIDENTIALITY|ISC_REQ_ALLOCATE_MEMORY; ISC_REQ_CONFIDENTIALITY|ISC_REQ_ALLOCATE_MEMORY;
ULONG ret_flags=0; ULONG ret_flags=0;
@ -503,7 +503,7 @@ static Ssh_gss_stat ssh_sspi_free_tok(struct ssh_gss_library *lib,
static Ssh_gss_stat ssh_sspi_release_cred(struct ssh_gss_library *lib, static Ssh_gss_stat ssh_sspi_release_cred(struct ssh_gss_library *lib,
Ssh_gss_ctx *ctx) Ssh_gss_ctx *ctx)
{ {
winSsh_gss_ctx *winctx= (winSsh_gss_ctx *) *ctx; winSsh_gss_ctx *winctx = (winSsh_gss_ctx *) *ctx;
/* check input */ /* check input */
if (winctx == NULL) return SSH_GSS_FAILURE; if (winctx == NULL) return SSH_GSS_FAILURE;
@ -523,7 +523,7 @@ static Ssh_gss_stat ssh_sspi_release_cred(struct ssh_gss_library *lib,
static Ssh_gss_stat ssh_sspi_release_name(struct ssh_gss_library *lib, static Ssh_gss_stat ssh_sspi_release_name(struct ssh_gss_library *lib,
Ssh_gss_name *srv_name) Ssh_gss_name *srv_name)
{ {
char *pStr= (char *) *srv_name; char *pStr = (char *) *srv_name;
if (pStr == NULL) return SSH_GSS_FAILURE; if (pStr == NULL) return SSH_GSS_FAILURE;
sfree(pStr); sfree(pStr);
@ -587,7 +587,7 @@ static Ssh_gss_stat ssh_sspi_get_mic(struct ssh_gss_library *lib,
Ssh_gss_ctx ctx, Ssh_gss_buf *buf, Ssh_gss_ctx ctx, Ssh_gss_buf *buf,
Ssh_gss_buf *hash) Ssh_gss_buf *hash)
{ {
winSsh_gss_ctx *winctx= (winSsh_gss_ctx *) ctx; winSsh_gss_ctx *winctx = (winSsh_gss_ctx *) ctx;
SecPkgContext_Sizes ContextSizes; SecPkgContext_Sizes ContextSizes;
SecBufferDesc InputBufferDescriptor; SecBufferDesc InputBufferDescriptor;
SecBuffer InputSecurityToken[2]; SecBuffer InputSecurityToken[2];
@ -634,7 +634,7 @@ static Ssh_gss_stat ssh_sspi_verify_mic(struct ssh_gss_library *lib,
Ssh_gss_buf *buf, Ssh_gss_buf *buf,
Ssh_gss_buf *mic) Ssh_gss_buf *mic)
{ {
winSsh_gss_ctx *winctx= (winSsh_gss_ctx *) ctx; winSsh_gss_ctx *winctx = (winSsh_gss_ctx *) ctx;
SecBufferDesc InputBufferDescriptor; SecBufferDesc InputBufferDescriptor;
SecBuffer InputSecurityToken[2]; SecBuffer InputSecurityToken[2];
ULONG qop; ULONG qop;

2
windows/window.c
View File

@ -4675,7 +4675,7 @@ static int TranslateKey(WinGuiSeat *wgs, UINT message, WPARAM wParam,
/* helg: clear CAPS LOCK state if caps lock switches to cyrillic */ /* helg: clear CAPS LOCK state if caps lock switches to cyrillic */
if(keystate[VK_CAPITAL] != 0 && if(keystate[VK_CAPITAL] != 0 &&
conf_get_bool(wgs->conf, CONF_xlat_capslockcyr)) { conf_get_bool(wgs->conf, CONF_xlat_capslockcyr)) {
capsOn= !left_alt; capsOn = !left_alt;
keystate[VK_CAPITAL] = 0; keystate[VK_CAPITAL] = 0;
} }