Tera TermRevision: 9871
https://osdn.net/projects/ttssh2/scm/svn/commits/9871
Author: zmatsuo
Date: 2022-04-20 22:02:00 +0900 (Wed, 20 Apr 2022)
Log Message:
-----------
ファイル内グローバル変数の使用を減らした
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys_log.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp 2022-04-20 13:01:51 UTC (rev 9870)
+++ trunk/teraterm/teraterm/filesys_log.cpp 2022-04-20 13:02:00 UTC (rev 9871)
@@ -725,7 +725,7 @@
cv_LCount = 0;
OpenLogFile(fv);
- if (LogVar->FileHandle == INVALID_HANDLE_VALUE) {
+ if (fv->FileHandle == INVALID_HANDLE_VALUE) {
return FALSE;
}
@@ -733,7 +733,7 @@
fv->eLineEnd = Line_LineHead;
if (ts.Append > 0)
{
- SetFilePointer(LogVar->FileHandle, 0, NULL, FILE_END);
+ SetFilePointer(fv->FileHandle, 0, NULL, FILE_END);
/* 2007.05.24 Gentaro
If log file already exists,
a newline is inserted before the first timestamp.
@@ -748,33 +748,33 @@
}
// Log rotate configuration
- LogVar->RotateMode = ts.LogRotate;
- LogVar->RotateSize = ts.LogRotateSize;
- LogVar->RotateStep = ts.LogRotateStep;
+ fv->RotateMode = ts.LogRotate;
+ fv->RotateSize = ts.LogRotateSize;
+ fv->RotateStep = ts.LogRotateStep;
// Log rotate\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x81A\x8F\x89\x8A\xFA\x83t\x83@\x83C\x83\x8B\x83T\x83C\x83Y\x82\xF0\x90ݒ肷\x82\xE9\x81B
// \x8Dŏ\x89\x82̃t\x83@\x83C\x83\x8B\x82\xAA\x90ݒ肵\x82\xBD\x83T\x83C\x83Y\x82Ń\x8D\x81[\x83e\x81[\x83g\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82̏C\x90\xB3\x81B
// (2016.4.9 yutaka)
- if (LogVar->RotateMode != ROTATE_NONE) {
- DWORD size = GetFileSize(LogVar->FileHandle, NULL);
+ if (fv->RotateMode != ROTATE_NONE) {
+ DWORD size = GetFileSize(fv->FileHandle, NULL);
if (size == -1) {
return FALSE;
}
- LogVar->ByteCount = size;
+ fv->ByteCount = size;
}
else {
- LogVar->ByteCount = 0;
+ fv->ByteCount = 0;
}
- if (! OpenFTDlg_(LogVar)) {
+ if (! OpenFTDlg_(fv)) {
return FALSE;
}
- LogVar->IsPause = FALSE;
- LogVar->StartTime = GetTickCount();
+ fv->IsPause = FALSE;
+ fv->StartTime = GetTickCount();
if (ts.DeferredLogWriteMode) {
- StartThread(LogVar);
+ StartThread(fv);
}
if (FileLog) {
@@ -1557,22 +1557,22 @@
case 0: {
// UTF-8
const char *bom = "\xef\xbb\xbf";
- WriteFile(LogVar->FileHandle, bom, 3, &wrote, NULL);
- LogVar->ByteCount += 3;
+ WriteFile(fv->FileHandle, bom, 3, &wrote, NULL);
+ fv->ByteCount += 3;
break;
}
case 1: {
// UTF-16LE
const char *bom = "\xff\xfe";
- WriteFile(LogVar->FileHandle, bom, 2, &wrote, NULL);
- LogVar->ByteCount += 2;
+ WriteFile(fv->FileHandle, bom, 2, &wrote, NULL);
+ fv->ByteCount += 2;
break;
}
case 2: {
// UTF-16BE
const char *bom = "\xfe\xff";
- WriteFile(LogVar->FileHandle, bom, 2, &wrote, NULL);
- LogVar->ByteCount += 2;
+ WriteFile(fv->FileHandle, bom, 2, &wrote, NULL);
+ fv->ByteCount += 2;
break;
}
default: