[Ttssh2-commit] [8463] 未使用変数、未使用defineを削除

scmno****@osdn***** scmno****@osdn*****
2020年 1月 10日 (金) 22:13:26 JST


Revision: 8463
          https://osdn.net/projects/ttssh2/scm/svn/commits/8463
Author:   zmatsuo
Date:     2020-01-10 22:13:26 +0900 (Fri, 10 Jan 2020)
Log Message:
-----------
未使用変数、未使用defineを削除

Modified Paths:
--------------
    trunk/teraterm/teraterm/ftdlg_lite.cpp
    trunk/teraterm/teraterm/protodlg.cpp
    trunk/teraterm/teraterm/sendmem.cpp
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ftdlg_lite.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg_lite.cpp	2020-01-10 13:13:15 UTC (rev 8462)
+++ trunk/teraterm/teraterm/ftdlg_lite.cpp	2020-01-10 13:13:26 UTC (rev 8463)
@@ -1,5 +1,5 @@
 /*
- * (C) 2019 TeraTerm Project
+ * (C) 2019-2020 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -183,8 +183,6 @@
 	HANDLE SmallIcon;
 	HANDLE BigIcon;
 	const char *UILanguageFile_;
-	wchar_t *Cation;
-	wchar_t *Filename;
 
 public:
 	BOOL Pause;

Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp	2020-01-10 13:13:15 UTC (rev 8462)
+++ trunk/teraterm/teraterm/protodlg.cpp	2020-01-10 13:13:26 UTC (rev 8463)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2019 TeraTerm Project
+ * (C) 2007-2020 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,6 @@
 #include "dlglib.h"
 #include "protodlg.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 // CProtoDlg dialog
 

Modified: trunk/teraterm/teraterm/sendmem.cpp
===================================================================
--- trunk/teraterm/teraterm/sendmem.cpp	2020-01-10 13:13:15 UTC (rev 8462)
+++ trunk/teraterm/teraterm/sendmem.cpp	2020-01-10 13:13:26 UTC (rev 8463)
@@ -391,8 +391,6 @@
 	// CR+LF -> LF
 	// CR    -> LF
 	// LF    -> LF (\x95ϊ\xB7\x95s\x97v)
-	int cr_count = 0;
-	int lf_count = 0;
 	const wchar_t *p = src;
 	const wchar_t *p_end = src + src_len;
 	wchar_t *dest = dest_top;

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2020-01-10 13:13:15 UTC (rev 8462)
+++ trunk/teraterm/teraterm/vtwin.cpp	2020-01-10 13:13:26 UTC (rev 8463)
@@ -60,7 +60,9 @@
 #include "teraterml.h"
 
 #include <stdio.h>
+#define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
+#include <crtdbg.h>
 #include <string.h>
 #include <locale.h>
 #include <tchar.h>
@@ -69,7 +71,6 @@
 #include <io.h>
 #include <errno.h>
 #include <imagehlp.h>
-#include <crtdbg.h>
 
 #include <windowsx.h>
 #include <imm.h>
@@ -101,35 +102,6 @@
 
 #define VTClassName _T("VTWin32")
 
-#undef SetDlgItemText
-#define SetDlgItemText SetDlgItemTextA
-#undef CreateProcess
-#define CreateProcess CreateProcessA
-#undef STARTUPINFO
-#define STARTUPINFO STARTUPINFOA
-#undef GetStartupInfo
-#define GetStartupInfo GetStartupInfoA
-
-#if defined(UNICODE)
-#define CreateProcessT CreateProcessW
-#define GetStartupInfoT GetStartupInfoW
-#define STARTUPINFOT STARTUPINFOW
-#define SetDlgItemTextT SetDlgItemTextW
-#else
-#define CreateProcessT CreateProcessA
-#define GetStartupInfoT GetStartupInfoA
-#define STARTUPINFOT STARTUPINFOA
-#define SetDlgItemTextT SetDlgItemTextA
-#endif
-
-#ifdef _DEBUG
-#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
-#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
-#if defined(_MSC_VER)
-#define new  		::new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#endif
-#endif
-
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
 #define WINDOW_MAXMIMUM_ENABLED 1
 
@@ -1695,7 +1667,7 @@
 }
 
 /* copy from ttset.c*/
-static void WriteInt2(PCHAR Sect, PCHAR Key, PCHAR FName, int i1, int i2)
+static void WriteInt2(const char *Sect, const char *Key, const char *FName, int i1, int i2)
 {
 	char Temp[32];
 	_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%d,%d", i1, i2);
@@ -4850,10 +4822,10 @@
 static BOOL CALLBACK TFontHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	if (Message == WM_INITDIALOG) {
-		TCHAR uimsg[MAX_UIMSG];
-		get_lang_msgT("DLG_CHOOSEFONT_STC6", uimsg, _countof(uimsg),
-					  _T("\"Font style\" selection here won't affect actual font appearance."), ts.UILanguageFile);
-		SetDlgItemTextT(Dialog, stc6, uimsg);
+		wchar_t uimsg[MAX_UIMSG];
+		get_lang_msgW("DLG_CHOOSEFONT_STC6", uimsg, _countof(uimsg),
+					  L"\"Font style\" selection here won't affect actual font appearance.", ts.UILanguageFile);
+		_SetDlgItemTextW(Dialog, stc6, uimsg);
 
 		SetFocus(GetDlgItem(Dialog,cmb1));
 


Ttssh2-commit メーリングリストの案内