Tera Term

[Ttssh2-commit] [9118] mbstring.h を削除

• 前の記事 (スレッド) [Ttssh2-commit] [9117] 未使用変数削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9118
          https://osdn.net/projects/ttssh2/scm/svn/commits/9118
Author:   zmatsuo
Date:     2020-12-29 00:38:09 +0900 (Tue, 29 Dec 2020)
Log Message:
-----------
mbstring.h を削除

- 使用していないヘッダファイル

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpmacro/ttl.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2020-12-28 15:37:58 UTC (rev 9117)
+++ trunk/teraterm/teraterm/vtterm.c	2020-12-28 15:38:09 UTC (rev 9118)
@@ -32,7 +32,6 @@
 #include "tttypes.h"
 #include <stdio.h>
 #include <string.h>
-#include <mbstring.h>
 #include <locale.h>
 #include <ctype.h>
 #if !defined(_CRTDBG_MAP_ALLOC)

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2020-12-28 15:37:58 UTC (rev 9117)
+++ trunk/teraterm/ttpcmn/language.c	2020-12-28 15:38:09 UTC (rev 9118)
@@ -29,7 +29,6 @@
 
 // TTCMN.DLL character code conversion
 
-#include <mbstring.h>
 #include <locale.h>
 #include "teraterm.h"
 #include "tttypes.h"
@@ -426,7 +425,7 @@
 
 static int RussIdToIndex(int id)
 {
-	return 
+	return
 		id == IdWindows ? 0:
 		id == IdKOI8 ? 1:
 		id == Id866 ? 2:

Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp	2020-12-28 15:37:58 UTC (rev 9117)
+++ trunk/teraterm/ttpmacro/ttl.cpp	2020-12-28 15:38:09 UTC (rev 9118)
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <mbstring.h>
 #include <time.h>
 #include <errno.h>
 #include "tt-version.h"
@@ -1481,7 +1480,7 @@
 	return Err;
 }
 
-// Format: fileunlock <file handle> 
+// Format: fileunlock <file handle>
 // (2012.4.19 yutaka)
 WORD TTLFileUnLock()
 {
@@ -2340,7 +2339,7 @@
 	if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, info, sizeof(info), &socknum, NULL, NULL) != SOCKET_ERROR) {
 		n = socknum / sizeof(info[0]);
 		for (i = 0 ; i < n ; i++) {
-			if ((info[i].iiFlags & IFF_UP) == 0) 
+			if ((info[i].iiFlags & IFF_UP) == 0)
 				continue;
 			if ((info[i].iiFlags & IFF_LOOPBACK) != 0)
 				continue;
@@ -2471,7 +2470,7 @@
 	if (Err!=0) return Err;
 
 	// \x95\xB6\x8E\x9A\x97񂪋\xF3\x82̏ꍇ\x82̓G\x83\x89\x81[\x82Ƃ\xB7\x82\xE9\x81B
-	if (FileNameStr[0]==0 || 
+	if (FileNameStr[0]==0 ||
 	    KeyStr[0]==0 ||
 	    VarStr[0]==0)   // "getpassword"\x93\xAF\x97l\x81A\x8B\xF3\x83p\x83X\x83\x8F\x81[\x83h\x82\xE0\x8B\x96\x89‚\xB5\x82Ȃ\xA2\x81B
 		Err = ErrSyntax;
@@ -2482,7 +2481,7 @@
 	// \x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x88Í\x86\x89\xBB\x82\xB7\x82\xE9\x81B
 	Encrypt(VarStr, Temp);
 
-	if (WritePrivateProfileString("Password", KeyStr, Temp, FileNameStr) != 0) 
+	if (WritePrivateProfileString("Password", KeyStr, Temp, FileNameStr) != 0)
 		result = 1;  /* success */
 
 	SetResult(result);  // \x90\xAC\x8C\xF7\x89”ۂ\xF0\x90ݒ肷\x82\xE9\x81B
@@ -2495,7 +2494,7 @@
 	TStrVal FileNameStr, KeyStr;
 	char Temp[512];
 	WORD Err;
-	int result = 0; 
+	int result = 0;
 
 	Err = 0;
 	GetStrVal(FileNameStr, &Err);   // \x83t\x83@\x83C\x83\x8B\x96\xBC
@@ -2505,7 +2504,7 @@
 	if (Err!=0) return Err;
 
 	// \x95\xB6\x8E\x9A\x97񂪋\xF3\x82̏ꍇ\x82̓G\x83\x89\x81[\x82Ƃ\xB7\x82\xE9\x81B
-	if (FileNameStr[0]==0 || 
+	if (FileNameStr[0]==0 ||
 	    KeyStr[0]==0)
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
@@ -2516,9 +2515,9 @@
 	GetPrivateProfileString("Password", KeyStr,"",
 	                        Temp, sizeof(Temp), FileNameStr);
 	if (Temp[0] == 0) { // password not exist
-		result = 0; 
+		result = 0;
 	} else {
-		result = 1; 
+		result = 1;
 	}
 
 	SetResult(result);  // \x90\xAC\x8C\xF7\x89”ۂ\xF0\x90ݒ肷\x82\xE9\x81B
@@ -2561,7 +2560,7 @@
 	const char *format;
 	BOOL set_result;
 	const char *tz = NULL;
-	char tz_copy[128]; 
+	char tz_copy[128];
 
 	// Save timezone
 	tz = getenv("TZ");
@@ -2897,7 +2896,7 @@
 // logrotate rotate num
 // logrotate halt
 //
-WORD TTLLogRotate() 
+WORD TTLLogRotate()
 {
 	WORD Err;
 	char Str[MaxStrLen];
@@ -2953,7 +2952,7 @@
 	} else if (strcmp(Str, "halt") == 0) {
 		Err = 0;
 		_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s", Str);
-	} 
+	}
 	if (Err!=0) return Err;
 
 	SetFile(buf);
@@ -2962,7 +2961,7 @@
 	return Err;
 }
 
-WORD TTLLogInfo() 
+WORD TTLLogInfo()
 {
 	WORD Err;
 	TVarId VarId;
@@ -3233,7 +3232,7 @@
 
 // add 'random' command
 // SYNOPSIS: random <intvar> <value>
-// DESCRIPTION: 
+// DESCRIPTION:
 // This command generates the random value from 0 to <value> and
 // stores the value to <intvar>.
 // (2006.2.11 yutaka)
@@ -3747,7 +3746,7 @@
 					}
 					strncat_s(buff, bufflen, tmp, _TRUNCATE);
 					break;
-				case TypString: 
+				case TypString:
 					AddBroadcastString(buff, bufflen, StrVarPtr((TVarId)Val));
 					break;
 				default:
@@ -4536,7 +4535,7 @@
 
 	ret = FindRegexStringOne(Str2, strlen(Str2), Str1, strlen(Str1));
 	if (ret > 0) { // matched
-		result = ret; 
+		result = ret;
 	} else {
 		result = 0;
 	}
@@ -4651,7 +4650,7 @@
 			 <-->len
 	   XXXXXX****YYY
 	        ^index(np)
-			     ^np+len 
+			     ^np+len
 				 <-->srclen - len - index
 		    \x81\xAB
 	   XXXXXXYYY
@@ -4833,16 +4832,16 @@
 
 	// \x95\xB6\x8E\x9A\x97\xF1\x82̐擪\x82\xA9\x82猟\x8D\x{142DC2}\xE9
 	for (i = 0 ; i < srclen ; i++) {
-		if (table[srcptr[i]] == 0) 
+		if (table[srcptr[i]] == 0)
 			break;
 	}
 	// \x8D폜\x82\xB3\x82\xEA\x82Ȃ\xA2\x97L\x8C\xF8\x82ȕ\xB6\x8E\x9A\x97\xF1\x82̎n\x82܂\xE8\x81B
 	// \x82\xB7\x82ׂč폜\x91ΏۂƂȂ\xE9\x8Fꍇ\x82́Astart == srclen \x81B
-	start = i;  
+	start = i;
 
 	// \x95\xB6\x8E\x9A\x97\xF1\x82̖\x96\x94\x{182A42}猟\x8D\x{142DC2}\xE9
 	for (i = srclen - 1 ; i >= 0 ; i--) {
-		if (table[srcptr[i]] == 0) 
+		if (table[srcptr[i]] == 0)
 			break;
 	}
 	// \x8D폜\x82\xB3\x82\xEA\x82Ȃ\xA2\x97L\x8C\xF8\x82ȕ\xB6\x8E\x9A\x97\xF1\x82̏I\x82\xED\x82\xE8\x81B
@@ -4917,7 +4916,7 @@
 		tok[i] = strtok_s(NULL, delimchars, &last);
 		if (tok[i] == NULL)
 			break;
-	} 
+	}
 #else
 	/* strtok\x82\xF0\x8Eg\x82\xA4\x82ƁA\x98A\x91\xB1\x82\xB5\x82\xBD\x8B\xE6\x90؂肪1\x82‚Ɋۂ߂\xE7\x82\xEA\x82邽\x82߁A\x8E\xA9\x91O\x82Ń|\x83C\x83\x93\x83^\x82\xF0
 	 * \x82\xBD\x82ǂ\xE9\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x8B\xE6\x90؂蕶\x8E\x9A\x82\xCD1\x82‚݂̂Ƃ\xB7\x82\xE9\x81B
@@ -4928,7 +4927,7 @@
 		if (i >= maxvar)
 			goto end;
 	}
-	
+
 	for (p = strtok_s(p, delimchars, &last); p != NULL ; p = strtok_s(NULL, delimchars, &last) ) {
 		tok[i++] = p;
 		if (i >= maxvar)
@@ -5225,7 +5224,7 @@
 
 // 'waitregex'(wait regular expression): wait command with regular expression
 //
-// This command has almost same function of 'wait' command. Additionally 'waitregex' can search 
+// This command has almost same function of 'wait' command. Additionally 'waitregex' can search
 // the keyword with regular expression. Tera Term uses a regex library that is called 'Oniguruma'.
 // cf. http://www.geocities.jp/kosako3/oniguruma/
 //
@@ -5474,7 +5473,7 @@
 	return SendCmnd(CmdYmodemSend,IdTTLWaitCmndResult);
 }
 
-// SYNOPSIS: 
+// SYNOPSIS:
 //   scpsend "c:\usr\sample.chm" "doc/sample.chm"
 //   scpsend "c:\usr\sample.chm"
 WORD TTLScpSend()
@@ -5506,7 +5505,7 @@
 	return SendCmnd(CmdScpSend, 0);
 }
 
-// SYNOPSIS: 
+// SYNOPSIS:
 //   scprecv "foo.txt"
 //   scprecv "src/foo.txt" "c:\foo.txt"
 WORD TTLScpRecv()
@@ -5633,7 +5632,7 @@
 		return Err;
 	}
 
-	if (Result) 
+	if (Result)
 		switch (WId) {
 		case RsvBasename:
 			Err = TTLBasename(); break;
@@ -6091,7 +6090,7 @@
 						else
 							E = NewStrVar(Cmnd,StrVarPtr((TVarId)Val));
 						break;
-					default: 
+					default:
 						E = FALSE;
 					}
 					if (! E) Err = ErrTooManyVar;

• 前の記事 (スレッド) [Ttssh2-commit] [9117] 未使用変数削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]