[ttssh2-commit] [10747] 使用していない変数への代入を削除

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 6月 8日 (木) 22:55:39 JST


Revision: 10747
          https://osdn.net/projects/ttssh2/scm/svn/commits/10747
Author:   zmatsuo
Date:     2023-06-08 22:55:39 +0900 (Thu, 08 Jun 2023)
Log Message:
-----------
使用していない変数への代入を削除

- r10691
  - warning: unused variable 'SuggestedWindowWidth' [-Wunused-variable]
- コンパイラの警告に対応した
  - warning C4456: 'r' を宣言すると、以前のローカル宣言が隠蔽されます
  - warning: this statement may fall through [-Wimplicit-fallthrough=]
  - warning: the address of 'tttset::DialogFontNameW' will never be NULL [-Waddress]

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/10691

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2023-06-08 13:54:56 UTC (rev 10746)
+++ trunk/teraterm/teraterm/vtwin.cpp	2023-06-08 13:55:39 UTC (rev 10747)
@@ -1700,9 +1700,9 @@
 		}
 
 		data->SendIndex = 0;
-		// break;
+	}
+		// break; \x82Ȃ\xB5
 		// FALLTHROUGH
-	}
 	case 1:
 	next_file: {
 		if (data->SendIndex == DropListCount) {
@@ -3797,7 +3797,7 @@
 			// \x83t\x83@\x83C\x83\x8B\x8D폜
 			DeleteFileW(filename);
 		}
-		BOOL r = FLogOpen(filename, info.code, info.bom);
+		r = FLogOpen(filename, info.code, info.bom);
 		if (r != FALSE) {
 			if (FLogIsOpendText()) {
 				// \x8C\xBB\x8D݃o\x83b\x83t\x83@\x82ɂ\xA0\x82\xE9\x83f\x81[\x83^\x82\xF0\x82\xB7\x82ׂď\x91\x82\xAB\x8Fo\x82\xB5\x82Ă\xA9\x82\xE7\x81A
@@ -4370,7 +4370,7 @@
 
 		// LOGFONT\x8F\x80\x94\xF5
 		memset(&LogFont, 0, sizeof(LogFont));
-		if (ts.DialogFontNameW == NULL || ts.DialogFontNameW[0] == 0) {
+		if (ts.DialogFontNameW[0] == 0) {
 			// \x83t\x83H\x83\x93\x83g\x82\xAA\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x82\xE7OS\x90ݒ\xE8\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
 			GetMessageboxFontW(&LogFont);
 		}
@@ -4889,8 +4889,6 @@
 {
 	const UINT NewDPI = LOWORD(wp);
 	const RECT SuggestedWindowRect = *(RECT *)lp;
-	const int SuggestedWindowWidth = SuggestedWindowRect.right - SuggestedWindowRect.left;
-	const int SuggestedWindowHeight = SuggestedWindowRect.bottom - SuggestedWindowRect.top;
 
 	// \x90V\x82\xB5\x82\xA2DPI\x82ɍ\x87\x82킹\x82ăt\x83H\x83\x93\x83g\x82𐶐\xAC\x81A
 	// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x97̈\xE6\x82̃T\x83C\x83Y\x82\xF0\x8C\x88\x92肷\x82\xE9


ttssh2-commit メーリングリストの案内
Back to archive index