Tera TermRevision: 10330
https://osdn.net/projects/ttssh2/scm/svn/commits/10330
Author: zmatsuo
Date: 2022-10-19 23:27:02 +0900 (Wed, 19 Oct 2022)
Log Message:
-----------
コンパイラの警告対策
- unicode.cpp
- 警告: ISO C++ forbids converting a string constant to ‘char*’
- 書き換えできない文字列を書き換え可能文字列へ変換していたので修正
- extern しない変数に static を追加
- UnicodeBlockList[]
- buffer.c
- 警告: 使用されない変数 ‘b’ です
Modified Paths:
--------------
trunk/teraterm/teraterm/buffer.c
trunk/teraterm/teraterm/unicode.cpp
trunk/teraterm/teraterm/unicode.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2022-10-19 03:09:51 UTC (rev 10329)
+++ trunk/teraterm/teraterm/buffer.c 2022-10-19 14:27:02 UTC (rev 10330)
@@ -2894,7 +2894,6 @@
if (StrChangeCount == 0) {
// \x95`\x89\xE6\x97\\x92肪\x82Ȃ\xA2(StrChangeCount==0)\x82̂ɁA
// \x8C\x8B\x8D\x87\x95\xB6\x8E\x9A\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x8Fꍇ\x81A\x95`\x89悷\x82\xE9
- buff_char_t *b = &CodeLineW[CursorX];
if (Wrap) {
if (!BuffIsHalfWidthFromPropery(&ts, p->WidthProperty)) {
// \x8Ds\x96\x96\x82\xC92\x83Z\x83\x8B\x82̕\xB6\x8E\x9A\x82\xAA\x95`\x89\xE6\x8Dς݁A2\x83Z\x83\x8B\x82̉E\x91\xA4\x82ɃJ\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8F\xF3\x91\xD4
Modified: trunk/teraterm/teraterm/unicode.cpp
===================================================================
--- trunk/teraterm/teraterm/unicode.cpp 2022-10-19 03:09:51 UTC (rev 10329)
+++ trunk/teraterm/teraterm/unicode.cpp 2022-10-19 14:27:02 UTC (rev 10330)
@@ -103,10 +103,10 @@
typedef struct {
unsigned long code_from;
unsigned long code_to;
- char *block_name;
+ const char *block_name;
} UnicodeTableBlock_t;
-const UnicodeTableBlock_t UnicodeBlockList[] = {
+static const UnicodeTableBlock_t UnicodeBlockList[] = {
#include "unicode_block.tbl"
};
@@ -298,7 +298,7 @@
return SearchTableBlock(UnicodeBlockList, _countof(UnicodeBlockList), u32);
}
-char *UnicodeBlockName(int index)
+const char *UnicodeBlockName(int index)
{
if (index == -1) {
return "";
Modified: trunk/teraterm/teraterm/unicode.h
===================================================================
--- trunk/teraterm/teraterm/unicode.h 2022-10-19 03:09:51 UTC (rev 10329)
+++ trunk/teraterm/teraterm/unicode.h 2022-10-19 14:27:02 UTC (rev 10330)
@@ -41,7 +41,7 @@
int UnicodeToISO8859(int part, unsigned long u32, unsigned char *b);
int UnicodeIsVirama(unsigned long u32);
int UnicodeBlockIndex(unsigned long u32);
-char *UnicodeBlockName(int);
+const char *UnicodeBlockName(int);
#ifdef __cplusplus
}