コミット: 4f0388b81f6f9a9b31c08d7cecbb444fa8f3fe10 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

コミットメタ情報

• リビジョン: 4f0388b81f6f9a9b31c08d7cecbb444fa8f3fe10 (tree)
• 日時: 2019-01-25 21:38:03
• 作者: zmatsuo <zmatsuo@user...>
• コミッター: zmatsuo

ログメッセージ

combining_map_t, codemap_t テーブルをconstにした

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@7407 f5f01b69-1e22-0410-acbf-894ab4bd6246

変更サマリ

• modified: teraterm/teraterm/uni2sjis.map
• modified: teraterm/teraterm/uni_combining.map
• modified: teraterm/teraterm/unisym2decsp.map
• modified: teraterm/teraterm/vtterm.c
• modified: teraterm/ttpcmn/language.c
• modified: teraterm/ttpcmn/language.h

差分

--- a/teraterm/teraterm/uni2sjis.map
+++ b/teraterm/teraterm/uni2sjis.map
@@ -31,7 +31,7 @@
  * cf. ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT
  *
  */
-static codemap_t mapUnicodeToSJIS[] = {
+static const codemap_t mapUnicodeToSJIS[] = {
 	{ 0x0020, 0x0020 },
 	{ 0x0021, 0x0021 },
 	{ 0x0022, 0x0022 },

--- a/teraterm/teraterm/uni_combining.map
+++ b/teraterm/teraterm/uni_combining.map
@@ -35,7 +35,7 @@ typedef struct combining_map {
  * cf. http://developer.apple.com/technotes/tn/tn1150table.html
  *
  */
-static combining_map_t mapCombiningToPrecomposed[] = {
+static const combining_map_t mapCombiningToPrecomposed[] = {
 	 {0x00C0,   0x0041, 0x0300},
 	 {0x00C1,   0x0041, 0x0301},
 	 {0x00C2,   0x0041, 0x0302},

--- a/teraterm/teraterm/unisym2decsp.map
+++ b/teraterm/teraterm/unisym2decsp.map
@@ -30,7 +30,7 @@
 /*
  * Map of Unicode Symbols to Dec Special Characters
  */
-static codemap_t mapUnicodeSymbolToDecSp[] = {
+static const codemap_t mapUnicodeSymbolToDecSp[] = {
 	/*
 	 * Latin-1 supplement
 	 *   http://www.unicode.org/charts/PDF/U0080.pdf

--- a/teraterm/teraterm/vtterm.c
+++ b/teraterm/teraterm/vtterm.c
@@ -5421,8 +5421,8 @@ static void ParseASCII(BYTE b)
 //
 #include "uni_combining.map"
 
-unsigned short GetPrecomposedChar(int start_index, unsigned short first_code, unsigned short code,
-								 combining_map_t *table, int tmax)
+static unsigned short GetPrecomposedChar(int start_index, unsigned short first_code, unsigned short code,
+										 const combining_map_t *table, int tmax)
 {
 	unsigned short result = 0;
 	int i;
@@ -5441,7 +5441,7 @@ unsigned short GetPrecomposedChar(int start_index, unsigned short first_code, un
 	return (result);
 }
 
-int GetIndexOfCombiningFirstCode(unsigned short code, combining_map_t *table, int tmax)
+static int GetIndexOfCombiningFirstCode(unsigned short code, const combining_map_t *table, int tmax)
 {
 	int low, mid, high;
 	int index = -1;

--- a/teraterm/ttpcmn/language.c
+++ b/teraterm/ttpcmn/language.c
@@ -38,7 +38,7 @@
 #include "codeconv.h"
 #include "sjis2uni.map"
 
-unsigned short ConvertUnicode(unsigned short code, codemap_t *table, int tmax)
+unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
 {
 	int low, mid, high;
 	unsigned short result;
@@ -188,7 +188,7 @@ WORD PASCAL JIS2SJIS(WORD KCode)
 
 /* Russian charset conversion table by Andrey Nikiforov 19971114 */
 /* Updated by NAGATA Shinya 20111228 */
-static BYTE cpconv[4][4][128] =
+static const BYTE cpconv[4][4][128] =
 {
 #if 0
 // 1251 -> 1251 = dummy

--- a/teraterm/ttpcmn/language.h
+++ b/teraterm/ttpcmn/language.h
@@ -41,7 +41,7 @@ WORD PASCAL SJIS2EUC(WORD KCode);
 WORD PASCAL JIS2SJIS(WORD KCode);
 BYTE PASCAL RussConv(int cin, int cout, BYTE b);
 void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count);
-unsigned short ConvertUnicode(unsigned short code, codemap_t *table, int tmax);
+unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax);
 
 #ifdef __cplusplus
 }