Tera TermRevision: 9117
https://osdn.net/projects/ttssh2/scm/svn/commits/9117
Author: zmatsuo
Date: 2020-12-29 00:37:58 +0900 (Tue, 29 Dec 2020)
Log Message:
-----------
未使用変数削除
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2020-12-28 15:37:47 UTC (rev 9116)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2020-12-28 15:37:58 UTC (rev 9117)
@@ -223,7 +223,7 @@
}
// \x8Ew\x92肳\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82𑖍\xB8\x82\xB5\x81A\x8B\x96\x89\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x95\xB6\x8E\x9A\x81A\x8Fd\x95\xA1\x82\xB7\x82镶\x8E\x9A\x82͍폜\x82\xB7\x82\xE9\x81B
- //
+ //
// ex. (i=5 \x82̕\xB6\x8E\x9A\x82\xF0\x8D폜\x82\xB7\x82\xE9)
// i=012345
// >:=9<87;A@?B3026(\0)
@@ -231,7 +231,7 @@
// <------------>
// \x81\xAB
// >:=9<7;A@?B3026(\0)
- //
+ //
for (i = 0; buf[i] != 0; i++) {
int num = buf[i] - '0';
@@ -251,7 +251,7 @@
}
// \x8Ew\x92肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x95\xB6\x8E\x9A\x82\xAA\x82\xA0\x82\xEA\x82Adisabled line\x82̒\xBC\x91O\x82ɑ}\x93\xFC\x82\xB7\x82\xE9\x81B
- //
+ //
// ex. (Z\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9)
// k
// >:=9<87;A@?B3026(\0)
@@ -261,7 +261,7 @@
// >:=9<87;A@?B30026(\0)
// \x81\xAB k
// >:=9<87;A@?B3Z026(\0)
- //
+ //
for (j = 0; j < default_strings_len && default_strings[j] != 0; j++) {
int num = default_strings[j];
@@ -917,13 +917,13 @@
char *buf;
// \x82\xB7\x82łɓ\xAF\x82\xB6\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x93o\x98^\x8Dς݂̏ꍇ\x82͒lj\xC1\x82\xB5\x82Ȃ\xA2\x81B
- if (strstr(pvar->err_msg, msg))
+ if (strstr(pvar->err_msg, msg))
return;
-
+
buf_len = strlen(pvar->err_msg) + 3 + strlen(msg);
buf = malloc(buf_len);
// \x83\x81\x83\x82\x83\x8A\x82\xAA\x8Am\x95ۂł\xAB\x82Ȃ\xA2\x8Fꍇ\x82͉\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
- if (buf == NULL)
+ if (buf == NULL)
return;
strncpy_s(buf, buf_len, pvar->err_msg, _TRUNCATE);
@@ -1211,8 +1211,6 @@
WORD ComPortTable[MAXCOMPORT];
static char *ComPortDesc[MAXCOMPORT];
int comports;
- static HWND hwndHostname = NULL; // HOSTNAME dropdown
- static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown
switch (msg) {
case WM_INITDIALOG:
@@ -1663,7 +1661,7 @@
}
cur = start;
- while (next = GetParam(option, opt_len, cur)) {
+ while (next = GetParam(option, opt_len, cur)) {
DequoteParam(option, opt_len, option);
action = OPTION_NONE;
@@ -2287,7 +2285,7 @@
static WNDPROC g_defAboutDlgEditWndProc; // Edit Control\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB\x97p
static int g_deltaSumAboutDlg = 0; // \x83}\x83E\x83X\x83z\x83C\x81[\x83\x8B\x82\xCCDelta\x97ݐϗp
-static LRESULT CALLBACK AboutDlgEditWindowProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+static LRESULT CALLBACK AboutDlgEditWindowProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
WORD keys;
short delta;
@@ -3184,8 +3182,8 @@
RSA *rsa;
DSA *dsa;
EC_KEY *ecdsa;
- unsigned char *ed25519_sk;
- unsigned char *ed25519_pk;
+ unsigned char *ed25519_sk;
+ unsigned char *ed25519_pk;
ssh_keytype type;
} ssh_private_key_t;
@@ -3195,8 +3193,8 @@
RSA *rsa;
DSA *dsa;
EC_KEY *ecdsa;
- unsigned char *ed25519_sk;
- unsigned char *ed25519_pk;
+ unsigned char *ed25519_sk;
+ unsigned char *ed25519_pk;
ssh_keytype type;
} ssh_public_key_t;
@@ -3267,7 +3265,7 @@
public_key.rsa = pub;
break;
}
-
+
case KEY_DSA:
{
DSA *priv = NULL;
@@ -3877,7 +3875,7 @@
buffer_t *kdf = NULL;
buffer_t *encoded = NULL;
buffer_t *blob = NULL;
- int blocksize, keylen, ivlen, authlen, i, n;
+ int blocksize, keylen, ivlen, authlen, i, n;
unsigned char *key = NULL, salt[SALT_LEN];
char *kdfname = KDFNAME;
EVP_CIPHER_CTX *cipher_ctx = NULL;
@@ -3918,7 +3916,7 @@
// \x88Í\x86\x89\xBB\x82̏\x80\x94\xF5
// TODO: OpenSSH 6.5\x82ł\xCD -Z \x83I\x83v\x83V\x83\x87\x83\x93\x82ŁA\x88Í\x86\x89\xBB\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x8Ew\x92\xE8\x89\\x82\xBE\x82\xAA\x81A
// \x82\xB1\x82\xB1\x82ł\xCD"AES256-CBC"\x82ɌŒ\xE8\x82Ƃ\xB7\x82\xE9\x81B
- cipher_init_SSH2(cipher_ctx, key, keylen, key + keylen, ivlen, CIPHER_ENCRYPT,
+ cipher_init_SSH2(cipher_ctx, key, keylen, key + keylen, ivlen, CIPHER_ENCRYPT,
get_cipher_EVP_CIPHER(cipher), 0, 0, pvar);
SecureZeroMemory(key, keylen + ivlen);
free(key);
@@ -4765,10 +4763,10 @@
EVP_CIPHER_CTX_free(cipher_ctx);
}
- } else if (private_key.type == KEY_ED25519) { // SSH2 ED25519
+ } else if (private_key.type == KEY_ED25519) { // SSH2 ED25519
save_bcrypt_private_key(buf, filename, comment, dlg, pvar, rounds);
- } else { // SSH2 RSA, DSA, ECDSA
+ } else { // SSH2 RSA, DSA, ECDSA
int len;
FILE *fp;
const EVP_CIPHER *cipher;
@@ -4796,7 +4794,7 @@
TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
break;
}
-
+
switch (key_type) {
case KEY_RSA: // RSA
ret = PEM_write_RSAPrivateKey(fp, private_key.rsa, cipher, buf, len, NULL, NULL);
@@ -4953,7 +4951,7 @@
static void _dquote_string(char *str, char *dst, int dst_len)
{
int i, len, n;
-
+
len = strlen(str);
n = 0;
for (i = 0 ; i < len ; i++) {