Tera Term

[Ttssh2-commit] [8858] API名を修正

• 前の記事 (スレッド) [Ttssh2-commit] [8857] ログ関連API追加,ftdlg修正
• 次の記事 (スレッド) [Ttssh2-commit] [8859] 危険な警告を修正した
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 8858
          https://osdn.net/projects/ttssh2/scm/svn/commits/8858
Author:   zmatsuo
Date:     2020-07-26 01:00:00 +0900 (Sun, 26 Jul 2020)
Log Message:
-----------
API名を修正

- Log.. -> FLog..
  - r8852で追加したAPI
- 引数なし関数には (void) を追加

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/filesys.h
    trunk/teraterm/teraterm/ttdde.c
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2020-07-25 15:59:47 UTC (rev 8857)
+++ trunk/teraterm/teraterm/filesys.cpp	2020-07-25 16:00:00 UTC (rev 8858)
@@ -139,7 +139,7 @@
 static void CloseFileSync(PFileVar ptr);
 
 
-BOOL LoadTTFILE()
+BOOL LoadTTFILE(void)
 {
 	BOOL Err;
 
@@ -237,7 +237,7 @@
 	}
 }
 
-BOOL FreeTTFILE()
+BOOL FreeTTFILE(void)
 {
 	if (TTFILECount==0)
 		return FALSE;
@@ -407,7 +407,7 @@
 	strncpy_s(c, destlen, buf, _TRUNCATE);
 }
 
-static void FixLogOption()
+static void FixLogOption(void)
 {
 	if (ts.LogBinary) {
 		ts.LogTypePlainText = false;
@@ -787,7 +787,7 @@
 	return FALSE;
 }
 
-static BOOL LogStart()
+static BOOL LogStart(void)
 {
 	unsigned tid;
 
@@ -1127,7 +1127,7 @@
 
 }
 
-void LogToFile()
+void LogToFile(void)
 {
 	PCHAR Buf;
 	int Start, Count;
@@ -1279,7 +1279,7 @@
 
 }
 
-BOOL CreateLogBuf()
+BOOL CreateLogBuf(void)
 {
 	if (cv.HLogBuf==NULL)
 	{
@@ -1294,7 +1294,7 @@
 	return (cv.HLogBuf!=NULL);
 }
 
-void FreeLogBuf()
+void FreeLogBuf(void)
 {
 	if ((cv.HLogBuf==NULL) || FileLog || DDELog)
 		return;
@@ -1310,7 +1310,7 @@
 	cv.DCount = 0;
 }
 
-BOOL CreateBinBuf()
+BOOL CreateBinBuf(void)
 {
 	if (cv.HBinBuf==NULL)
 	{
@@ -1323,7 +1323,7 @@
 	return (cv.HBinBuf!=NULL);
 }
 
-void FreeBinBuf()
+void FreeBinBuf(void)
 {
 	if ((cv.HBinBuf==NULL) || BinLog)
 		return;
@@ -1337,7 +1337,7 @@
 	cv.BCount = 0;
 }
 
-void FileSendStart()
+void FileSendStart(void)
 {
 	LONG Option = 0;
 
@@ -1477,7 +1477,7 @@
 // - FileBracketMode == false
 // - cv.TelFlag == false
 // - ts.LocalEcho == 0
-void FileSendBinayBoost()
+void FileSendBinayBoost(void)
 {
 	WORD c, fc;
 	LONG BCOld;
@@ -1533,7 +1533,7 @@
 	FileTransEnd(OpSendFile);
 }
 
-void FileSend()
+void FileSend(void)
 {
 	WORD c, fc;
 	LONG BCOld;
@@ -1723,7 +1723,7 @@
 	return TRUE;
 }
 
-static void CloseProtoDlg()
+static void CloseProtoDlg(void)
 {
 	if (PtDlg!=NULL)
 	{
@@ -1745,7 +1745,7 @@
 	}
 }
 
-static BOOL ProtoStart()
+static BOOL ProtoStart(void)
 {
 	if (cv.ProtoFlag)
 		return FALSE;
@@ -1768,7 +1768,7 @@
 	return TRUE;
 }
 
-void ProtoEnd()
+void ProtoEnd(void)
 {
 	if (! cv.ProtoFlag)
 		return;
@@ -1796,7 +1796,7 @@
  *				1/2		ActiveWin(\x83O\x83\x8D\x81[\x83o\x83\x8B\x95ϐ\x94)\x82̒l(IdVT=1/IdTek=2)
  *				\x92\x8D \x8D\xA1\x82̂Ƃ\xB1\x82\xEB\x8ÊĂ\xE7\x82\xEA\x82Ă\xA2\x82\xE9
  */
-int ProtoDlgParse()
+int ProtoDlgParse(void)
 {
 	int P;
 
@@ -1813,13 +1813,13 @@
 	return P;
 }
 
-void ProtoDlgTimeOut()
+void ProtoDlgTimeOut(void)
 {
 	if (PtDlg!=NULL)
 		(*ProtoTimeOutProc)(ProtoId,FileVar,ProtoVar,&cv);
 }
 
-void ProtoDlgCancel()
+void ProtoDlgCancel(void)
 {
 	if ((PtDlg!=NULL) &&
 	    (*ProtoCancel)(ProtoId,FileVar,ProtoVar,&cv))
@@ -2131,7 +2131,7 @@
  *	\x83\x8D\x83O\x83\x8D\x81[\x83e\x81[\x83g\x82̐ݒ\xE8
  *	\x83\x8D\x83O\x82̃T\x83C\x83Y\x82\xAA<size>\x83o\x83C\x83g\x82𒴂\xA6\x82Ă\xA2\x82\xEA\x82΁A\x83\x8D\x81[\x83e\x81[\x83V\x83\x87\x83\x93\x82\xB7\x82\xE9\x82悤\x90ݒ肷\x82\xE9
  */
-void LogRotateSize(size_t size)
+void FLogRotateSize(size_t size)
 {
 	if (LogVar == NULL) {
 		return;
@@ -2144,7 +2144,7 @@
  *	\x83\x8D\x83O\x83\x8D\x81[\x83e\x81[\x83g\x82̐ݒ\xE8
  *	\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82̐\xA2\x91\xE3\x82\xF0\x90ݒ肷\x82\xE9
  */
-void LogRotateRotate(int step)
+void FLogRotateRotate(int step)
 {
 	if (LogVar == NULL) {
 		return;
@@ -2156,7 +2156,7 @@
  *	\x83\x8D\x83O\x83\x8D\x81[\x83e\x81[\x83g\x82̐ݒ\xE8
  *	\x83\x8D\x81[\x83e\x81[\x83V\x83\x87\x83\x93\x82\xF0\x92\xE2\x8E~
  */
-void LogRotateHalt(void)
+void FLogRotateHalt(void)
 {
 	if (LogVar == NULL) {
 		return;
@@ -2208,7 +2208,7 @@
 	return TRUE;
 }
 
-void LogAddCommentDlg(HINSTANCE hInst, HWND hWnd)
+void FLogAddCommentDlg(HINSTANCE hInst, HWND hWnd)
 {
 	// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82փR\x83\x81\x83\x93\x83g\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9 (2004.8.6 yutaka)
 	TTDialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
@@ -2215,13 +2215,13 @@
 				HVTWin, OnCommentDlgProc);
 }
 
-void LogClose()
+void FLogClose(void)
 {
 	if (LogVar != NULL)
 		FileTransEnd(OpLog);
 }
 
-BOOL LogOpen(const char *fname)
+BOOL FLogOpen(const char *fname)
 {
 	BOOL ret;
 
@@ -2236,13 +2236,13 @@
 	return ret;
 }
 
-BOOL LogIsOpend()
+BOOL FLogIsOpend(void)
 {
 	// LogVar->FileOpen
 	return LogVar != NULL;
 }
 
-void LogWriteStr(const char *str)
+void FLogWriteStr(const char *str)
 {
 	if (LogVar != NULL)
 	{
@@ -2256,7 +2256,7 @@
 	}
 }
 
-void LogInfo(char *param_ptr, size_t param_len)
+void FLogInfo(char *param_ptr, size_t param_len)
 {
 	if (LogVar) {
 		param_ptr[0] = '0'
@@ -2276,7 +2276,7 @@
 /**
  *	\x8C\xBB\x8D݂̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8E擾
  */
-const char *LogGetFilename()
+const char *FLogGetFilename()
 {
 	if (LogVar == NULL) {
 		return NULL;
@@ -2290,10 +2290,10 @@
  *	@retval	FALSE	\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB3\x82ꂽ
  *	@param[in,out]	filename	OK\x8E\x9E\x81A\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7free()\x82\xB7\x82邱\x82\xC6
  */
-BOOL LogOpenDialog(char **filename)
+BOOL FLogOpenDialog(char **filename)
 {
 	LogDlgData_t *data = (LogDlgData_t *)calloc(sizeof(LogDlgData_t), 1);
-	data->filename = LogGetLogFilename(NULL);
+	data->filename = FLogGetLogFilename(NULL);
 	INT_PTR ret = TTDialogBoxParam(
 		hInst, MAKEINTRESOURCE(IDD_LOGDLG),
 		HVTWin, LogFnHook, (LPARAM)data);
@@ -2317,7 +2317,7 @@
  *	@return						\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
  *								\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
  */
-char *LogGetLogFilename(const char *log_filename)
+char *FLogGetLogFilename(const char *log_filename)
 {
 	// \x83t\x83H\x83\x8B\x83_
 	char FileDirExpanded[MAX_PATH];

Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h	2020-07-25 15:59:47 UTC (rev 8857)
+++ trunk/teraterm/teraterm/filesys.h	2020-07-25 16:00:00 UTC (rev 8858)
@@ -68,30 +68,30 @@
 extern PTTFILESetUILanguageFile TTFILESetUILanguageFile;
 extern PTTFILESetFileSendFilter TTFILESetFileSendFilter;
 
-BOOL LoadTTFILE();
-BOOL FreeTTFILE();
+BOOL LoadTTFILE(void);
+BOOL FreeTTFILE(void);
 //void ShowFTDlg(WORD OpId);
 BOOL NewFileVar(PFileVar *FV);
 void FreeFileVar(PFileVar *FV);
 
 void LogPut1(BYTE b);
-void LogToFile();
-BOOL CreateLogBuf();
-void FreeLogBuf();
-BOOL CreateBinBuf();
-void FreeBinBuf();
+void LogToFile(void);
+BOOL CreateLogBuf(void);
+void FreeLogBuf(void);
+BOOL CreateBinBuf(void);
+void FreeBinBuf(void);
 
-void FileSendStart();
-void FileSend();
+void FileSendStart(void);
+void FileSend(void);
 //void FLogChangeButton(BOOL Pause);
 void FLogPause(BOOL Pause);
 void FileTransEnd(WORD OpId);
 void FileTransPause(WORD OpId, BOOL Pause);
 
-void ProtoEnd();
-int ProtoDlgParse();
-void ProtoDlgTimeOut();
-void ProtoDlgCancel();
+void ProtoEnd(void);
+int ProtoDlgParse(void);
+void ProtoDlgTimeOut(void);
+void ProtoDlgCancel(void);
 void KermitStart(int mode);
 void XMODEMStart(int mode);
 void YMODEMStart(int mode);
@@ -105,18 +105,18 @@
 
 // log
 void logfile_lock_initialize(void);
-void LogRotateSize(size_t size);
-void LogRotateRotate(int step);
-void LogRotateHalt(void);
-void LogAddCommentDlg(HINSTANCE hInst, HWND hWnd);
-void LogClose();
-BOOL LogOpen(const char *fname);
-BOOL LogIsOpend();
-void LogWriteStr(const char *str);
-void LogInfo(char *param_ptr, size_t param_len);
-const char *LogGetFilename();
-BOOL LogOpenDialog(char **filename);
-char *LogGetLogFilename(const char *log_filename);
+void FLogRotateSize(size_t size);
+void FLogRotateRotate(int step);
+void FLogRotateHalt(void);
+void FLogAddCommentDlg(HINSTANCE hInst, HWND hWnd);
+void FLogClose(void);
+BOOL FLogOpen(const char *fname);
+BOOL FLogIsOpend(void);
+void FLogWriteStr(const char *str);
+void FLogInfo(char *param_ptr, size_t param_len);
+const char *FLogGetFilename(void);
+BOOL FLogOpenDialog(char **filename);
+char *FLogGetLogFilename(const char *log_filename);
 BOOL FLogIsPause(void);
 void FLogWindow(int nCmdShow);
 void FLogShowDlg(void);

Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c	2020-07-25 15:59:47 UTC (rev 8857)
+++ trunk/teraterm/teraterm/ttdde.c	2020-07-25 16:00:00 UTC (rev 8858)
@@ -522,14 +522,14 @@
 
 		if (strncmp(p, "size", 4) == 0) {
 			s = atoi(&p[5]);
-			LogRotateSize(s);
+			FLogRotateSize(s);
 
 		} else if (strncmp(p, "rotate", 6) == 0) {
 			s = atoi(&p[7]);
-			LogRotateRotate(s);
+			FLogRotateRotate(s);
 
 		} else if (strncmp(p, "halt", 4) == 0) {
-			LogRotateHalt();
+			FLogRotateHalt();
 		}
 		break;
 	}
@@ -539,16 +539,16 @@
 		break;
 
 	case CmdLogClose:
-		LogClose();
+		FLogClose();
 		break;
 	case CmdLogOpen:
-		if (LogIsOpend()) {
+		if (FLogIsOpend()) {
 			return DDE_FNOTPROCESSED;
 		}
 		else {
 			char *ParamFileNameA = ToCharU8(ParamFileName);
-			char *log_filenameA = LogGetLogFilename(ParamFileNameA);
-			BOOL ret = LogOpen(log_filenameA);
+			char *log_filenameA = FLogGetLogFilename(ParamFileNameA);
+			BOOL ret = FLogOpen(log_filenameA);
 			free(log_filenameA);
 			free(ParamFileNameA);
 			strncpy_s(ParamFileName, sizeof(ParamFileName), ret ? "1" : "0", _TRUNCATE);
@@ -561,7 +561,7 @@
 		FLogPause(FALSE);
 		break;
 	case CmdLogWrite:
-		LogWriteStr(ParamFileName);
+		FLogWriteStr(ParamFileName);
 		break;
 	case CmdQVRecv:
 		if ((FileVar==NULL) && NewFileVar(&FileVar))
@@ -988,7 +988,7 @@
 	}
 
 	case CmdLogInfo:
-		LogInfo(ParamFileName, sizeof(ParamFileName) - 1);
+		FLogInfo(ParamFileName, sizeof(ParamFileName) - 1);
 		break;
 
 	default:
@@ -1062,7 +1062,7 @@
 		case XTYP_DISCONNECT:
 			// \x83}\x83N\x83\x8D\x8FI\x97\xB9\x8E\x9E\x81A\x83\x8D\x83O\x8D̎\xE6\x82\xF0\x8E\xA9\x93\xAE\x93I\x82ɒ\xE2\x8E~\x82\xB7\x82\xE9\x81B(2013.6.24 yutaka)
 			if (AutoLogClose) {
-				LogClose();
+				FLogClose();
 				AutoLogClose = FALSE;
 			}
 			ConvH = 0;

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2020-07-25 15:59:47 UTC (rev 8857)
+++ trunk/teraterm/teraterm/vtwin.cpp	2020-07-25 16:00:00 UTC (rev 8858)
@@ -1247,7 +1247,7 @@
 		EnableMenuItem(FileMenu,ID_FILE_LOGMEIN,MF_BYCOMMAND | MF_ENABLED);
 
 		// XXX: \x82\xB1\x82̈ʒu\x82ɂ\xB5\x82Ȃ\xA2\x82ƁAlog\x82\xAA\x83O\x83\x8C\x83C\x82ɂȂ\xE7\x82Ȃ\xA2\x81B (2005.2.1 yutaka)
-		if (LogIsOpend()) { // \x83\x8D\x83O\x8D̎惂\x81[\x83h\x82̏ꍇ
+		if (FLogIsOpend()) { // \x83\x8D\x83O\x8D̎惂\x81[\x83h\x82̏ꍇ
 			EnableMenuItem(FileMenu,ID_FILE_LOG,MF_BYCOMMAND | MF_GRAYED);
 			EnableMenuItem(FileMenu,ID_FILE_COMMENTTOLOG, MF_BYCOMMAND | MF_ENABLED);
 			EnableMenuItem(FileMenu,ID_FILE_VIEWLOG, MF_BYCOMMAND | MF_ENABLED);
@@ -3575,12 +3575,12 @@
 	/* Auto start logging or /L= option */
 	if (ts.LogAutoStart || ts.LogFN[0] != 0) {
 		if (ts.LogFN[0] == 0) {
-			char *filename = LogGetLogFilename(NULL);
+			char *filename = FLogGetLogFilename(NULL);
 			strncpy_s(ts.LogFN, sizeof(ts.LogFN), filename, _TRUNCATE);
 			free(filename);
 		}
 		if (ts.LogFN[0]!=0) {
-			LogOpen(ts.LogFN);
+			FLogOpen(ts.LogFN);
 		}
 	}
 
@@ -4138,9 +4138,9 @@
 void CVTWindow::OnFileLog()
 {
 	char *filename;
-	BOOL r = LogOpenDialog(&filename);
+	BOOL r = FLogOpenDialog(&filename);
 	if (r) {
-		LogOpen(filename);
+		FLogOpen(filename);
 		free(filename);
 	}
 }
@@ -4147,7 +4147,7 @@
 
 void CVTWindow::OnCommentToLog()
 {
-	LogAddCommentDlg(m_hInst, HVTWin);
+	FLogAddCommentDlg(m_hInst, HVTWin);
 }
 
 // \x83\x8D\x83O\x82̉{\x97\x97 (2005.1.29 yutaka)
@@ -4157,11 +4157,11 @@
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
 
-	if(!LogIsOpend()) {
+	if(!FLogIsOpend()) {
 		return;
 	}
 
-	const char *file = LogGetFilename();
+	const char *file = FLogGetFilename();
 
 	memset(&si, 0, sizeof(si));
 	GetStartupInfo(&si);

• 前の記事 (スレッド) [Ttssh2-commit] [8857] ログ関連API追加,ftdlg修正
• 次の記事 (スレッド) [Ttssh2-commit] [8859] 危険な警告を修正した
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]