Tera Term

[Ttssh2-commit] [8706] 無効化したコードを削除

• 前の記事 (スレッド) [Ttssh2-commit] [8705] StrVarPtr() の戻り値を char * から const char * に変更
• 次の記事 (スレッド) [Ttssh2-commit] [8707] ttmparse.cppにリネーム
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 8706
          https://osdn.net/projects/ttssh2/scm/svn/commits/8706
Author:   zmatsuo
Date:     2020-04-12 00:56:26 +0900 (Sun, 12 Apr 2020)
Log Message:
-----------
無効化したコードを削除

- r8652 で無効化した部分

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/8652

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttmparse.c

-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c	2020-04-11 15:56:16 UTC (rev 8705)
+++ trunk/teraterm/ttpmacro/ttmparse.c	2020-04-11 15:56:26 UTC (rev 8706)
@@ -68,37 +68,6 @@
 	WORD level;
 } TLab;
 
-#if 0
-// \x95ϐ\x94\x82̌\x94\x82\xF0128->256\x81A\x83\x89\x83x\x83\x8B\x82̌\x94\x82\xF0256->512\x82֊g\x92\xA3\x82\xB5\x82\xBD\x81B(2006.2.1 yutaka)
-// \x95ϐ\x94\x82̌\x94\x82\xF0\x81AInitTTL \x82ō\xEC\x82\xC1\x82Ă\xA2\x82\xE9\x83V\x83X\x83e\x83\x80\x95ϐ\x94\x82̕\xAA\x82\xBE\x82\xAF\x92lj\xC1\x82\xB5\x82\xBD\x81B(2006.7.26 maya)
-#define MaxNumOfIntVar (LONG)(256+4)
-#define MaxNumOfStrVar (LONG)(256+20)
-#define MaxNumOfLabVar (LONG)512
-#define MaxNumOfIntAryVar (LONG)256
-#define MaxNumOfStrAryVar (LONG)256
-
-#define IntVarIdOff (LONG)0
-#define StrVarIdOff (IntVarIdOff+MaxNumOfIntVar)
-#define LabVarIdOff (StrVarIdOff+MaxNumOfStrVar)
-#define IntAryVarIdOff (LabVarIdOff+MaxNumOfLabVar)
-#define StrAryVarIdOff (IntAryVarIdOff+MaxNumOfIntAryVar)
-#define MaxNumOfName (MaxNumOfIntVar+MaxNumOfStrVar+MaxNumOfLabVar+MaxNumOfIntAryVar+MaxNumOfStrAryVar)
-#define NameBuffLen MaxNumOfName*MaxNameLen
-#define StrBuffLen MaxNumOfStrVar*MaxStrLen
-
-static int IntVal[MaxNumOfIntVar];
-static BINT LabVal[MaxNumOfLabVar];
-static BYTE LabLevel[MaxNumOfLabVar];
-static TIntAry IntAryVal[MaxNumOfIntAryVar];
-static TStrAry StrAryVal[MaxNumOfStrAryVar];
-
-static HANDLE HNameBuff;
-static PCHAR NameBuff;
-static HANDLE HStrBuff;
-static PCHAR StrBuff;
-static WORD IntVarCount, StrVarCount, LabVarCount, IntAryVarCount, StrAryVarCount;
-#endif
-
 typedef enum {
 	TypeUnknown = TypUnknown,
 	TypeInteger = TypInteger,
@@ -133,33 +102,13 @@
 
 BOOL InitVar()
 {
-#if 0
-	HNameBuff = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT,NameBuffLen);
-	if (HNameBuff==NULL) return FALSE;
-	NameBuff = NULL;
-
-	HStrBuff = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT,StrBuffLen);
-	if (HStrBuff==NULL) return FALSE;
-	StrBuff = NULL;
-
-	IntVarCount = 0;
-	LabVarCount = 0;
-	StrVarCount = 0;
-	return TRUE;
-#else
 	Variables = NULL;
 	VariableCount = 0;
 	return TRUE;
-#endif
 }
 
 void EndVar()
 {
-#if 0
-	UnlockVar();
-	GlobalFree(HNameBuff);
-	GlobalFree(HStrBuff);
-#endif
 	// TODO Variables \x82\xF0\x82\xB7\x82ׂ\xC4 free \x82\xB7\x82\xE9
 }
 
@@ -209,30 +158,10 @@
 
 void LockVar()
 {
-#if 0
-	if (NameBuff==NULL)
-		NameBuff = GlobalLock(HNameBuff);
-	if (NameBuff==NULL)
-		PostQuitMessage(0);
-
-	if (StrBuff==NULL)
-		StrBuff = GlobalLock(HStrBuff);
-	if (StrBuff==NULL)
-		PostQuitMessage(0);
-#endif
 }
 
 void UnlockVar()
 {
-#if 0
-	if (NameBuff!=NULL)
-		GlobalUnlock(HNameBuff);
-	NameBuff = NULL;
-
-	if (StrBuff!=NULL)
-		GlobalUnlock(HStrBuff);
-	StrBuff = NULL;
-#endif
 }
 
 BOOL CheckReservedWord(PCHAR Str, LPWORD WordId)
@@ -903,60 +832,7 @@
 
 BOOL CheckVar(const char *Name, LPWORD VarType, PVarId VarId)
 {
-#if 0
 	int i;
-	long P;
-
-	*VarType = TypUnknown;
-
-	for (i=0; i<IntVarCount; i++) {
-		P = (i + IntVarIdOff) * MaxNameLen;
-		if (_stricmp(&NameBuff[P], Name) == 0) {
-			*VarType = TypInteger;
-			*VarId = (TVarId)i;
-			return TRUE;
-		}
-	}
-
-	for (i=0; i<StrVarCount; i++) {
-		P = (i + StrVarIdOff) * MaxNameLen;
-		if (_stricmp(&NameBuff[P], Name) == 0) {
-			*VarType = TypString;
-			*VarId = i;
-			return TRUE;
-		}
-	}
-
-	for (i=0; i<LabVarCount; i++) {
-		P = (i + LabVarIdOff) * MaxNameLen;
-		if (_stricmp(&NameBuff[P], Name) == 0) {
-			*VarType = TypLabel;
-			*VarId = i;
-			return TRUE;
-		}
-	}
-
-	for (i=0; i<IntAryVarCount; i++) {
-		P = (i + IntAryVarIdOff) * MaxNameLen;
-		if (_stricmp(&NameBuff[P], Name) == 0) {
-			*VarType = TypIntArray;
-			*VarId = i;
-			return TRUE;
-		}
-	}
-
-	for (i=0; i<StrAryVarCount; i++) {
-		P = (i + StrAryVarIdOff) * MaxNameLen;
-		if (_stricmp(&NameBuff[P], Name) == 0) {
-			*VarType = TypStrArray;
-			*VarId = i;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-#else
-	int i;
 	const Variable_t *v = Variables;
 	for (i = 0; i < VariableCount; v++,i++) {
 		if (_stricmp(v->Name, Name) == 0) {
@@ -968,7 +844,6 @@
 	*VarType = TypUnknown;
 	*VarId = 0;
 	return FALSE;
-#endif
 }
 
 static Variable_t *NewVar(const char *name, VariableType_t type)
@@ -988,57 +863,20 @@
 
 BOOL NewIntVar(const char *Name, int InitVal)
 {
-#if 0
-	long P;
-
-	if (IntVarCount>=MaxNumOfIntVar) return FALSE;
-	P = (IntVarIdOff+IntVarCount)*MaxNameLen;
-	strncpy_s(&NameBuff[P],MaxNameLen,Name,_TRUNCATE);
-	IntVal[IntVarCount] = InitVal;
-	IntVarCount++;
-	return TRUE;
-#else
 	Variable_t *v = NewVar(Name, TypeInteger);
 	v->Value.Int = InitVal;
 	return TRUE;
-#endif
 }
 
 BOOL NewStrVar(const char *Name, const char *InitVal)
 {
-#if 0
-	long P;
-
-	if (StrVarCount>=MaxNumOfStrVar) return FALSE;
-	P = (StrVarIdOff+StrVarCount)*MaxNameLen;
-	strncpy_s(&NameBuff[P],MaxNameLen,Name,_TRUNCATE);
-	P = StrVarCount*MaxStrLen;
-	strncpy_s(&StrBuff[P],MaxStrLen,InitVal,_TRUNCATE);
-	StrVarCount++;
-	return TRUE;
-#else
 	Variable_t *v = NewVar(Name, TypeString);
 	v->Value.Str = strdup(InitVal);
 	return TRUE;
-#endif
 }
 
 int NewIntAryVar(const char *Name, int size)
 {
-#if 0
-	long P;
-	if (IntAryVarCount >= MaxNumOfIntAryVar) return ErrTooManyVar;
-	if (size <= 0 || size > 65536) return ErrOutOfRange;
-
-	if ((IntAryVal[IntAryVarCount].val = calloc(size, sizeof(int))) == NULL) return ErrFewMemory;
-	IntAryVal[IntAryVarCount].size = size;
-
-	P = (IntAryVarIdOff + IntAryVarCount) * MaxNameLen;
-	strncpy_s(&NameBuff[P], MaxNameLen, Name, _TRUNCATE);
-
-	IntAryVarCount++;
-	return 0;
-#else
 	Variable_t *v = NewVar(Name, TypeIntArray);
 	TIntAry *intAry = &v->Value.IntAry;
 	int *array = calloc(size, sizeof(int));
@@ -1048,25 +886,10 @@
 	intAry->val = array;
 	intAry->size = size;
 	return 0;
-#endif
 }
 
 int NewStrAryVar(const char *Name, int size)
 {
-#if 0
-	long P;
-	if (StrAryVarCount >= MaxNumOfStrAryVar) return ErrTooManyVar;
-	if (size <= 0 || size > 65536) return ErrOutOfRange;
-
-	if ((StrAryVal[StrAryVarCount].val = calloc(size, sizeof(TStrVal))) == NULL) return ErrFewMemory;
-	StrAryVal[StrAryVarCount].size = size;
-
-	P = (StrAryVarIdOff + StrAryVarCount) * MaxNameLen;
-	strncpy_s(&NameBuff[P], MaxNameLen, Name, _TRUNCATE);
-
-	StrAryVarCount++;
-	return 0;
-#else
 	Variable_t *v = NewVar(Name, TypeStrArray);
 	TStrAry *strAry = &v->Value.StrAry;
 	char **array = calloc(size, sizeof(char *));
@@ -1076,37 +899,19 @@
 	strAry->val = array;
 	strAry->size = size;
 	return 0;
-#endif
 }
 
 BOOL NewLabVar(const char *Name, BINT InitVal, WORD ILevel)
 {
-#if 0
-	long P;
-
-	if (LabVarCount>=MaxNumOfLabVar) return FALSE;
-
-	P = (LabVarIdOff+LabVarCount)*MaxNameLen;
-	strncpy_s(&(NameBuff[P]),MaxNameLen,Name,_TRUNCATE);
-	LabVal[LabVarCount] = InitVal;
-	LabLevel[LabVarCount] = LOBYTE(ILevel);
-	LabVarCount++;
-	return TRUE;
-#else
 	Variable_t *v = NewVar(Name, TypeLabel);
 	TLab *lab = &v->Value.Lab;
 	lab->val = InitVal;
 	lab->level = ILevel;
 	return TRUE;
-#endif
 }
 
 void DelLabVar(WORD ILevel)
 {
-#if 0
-	while ((LabVarCount>0) && (LabLevel[LabVarCount-1]>=ILevel))
-		LabVarCount--;
-#else
 	Variable_t *v = Variables;
 	for (;;) {
 		if (v == &Variables[VariableCount]) {
@@ -1132,19 +937,13 @@
 		v++;
 	}
 	Variables = realloc(Variables, sizeof(Variable_t) * VariableCount);
-#endif
 }
 
 void CopyLabel(WORD ILabel, BINT far *Ptr, LPWORD Level)
 {
-#if 0
-	*Ptr = LabVal[ILabel];
-	*Level = (WORD)LabLevel[ILabel];
-#else
 	Variable_t *v = &Variables[ILabel];
 	*Ptr = v->Value.Lab.val;
 	*Level = v->Value.Lab.level;
-#endif
 }
 
 /*
@@ -1181,28 +980,17 @@
 		}
 		else if (CheckVar(Name, ValType, &VarId)) {
 			switch (*ValType) {
-#if 0
-				case TypInteger: *Val = IntVal[VarId]; break;
-#else
 				case TypInteger:
 					*Val = Variables[VarId].Value.Int;
 					break;
-#endif
 				case TypString: *Val = VarId; break;
 				case TypIntArray:
 					if (GetIndex(&Index, Err)) {
-#if 0
-						if (Index >= 0 && Index < IntAryVal[VarId].size) {
-							*Val = IntAryVal[VarId].val[Index];
-							*ValType = TypInteger;
-						}
-#else
 						TIntAry *intAry = &Variables[VarId].Value.IntAry;
 						if (Index >= 0 && Index < intAry->size) {
 							*Val = intAry->val[Index];
 							*ValType = TypInteger;
 						}
-#endif
 						else {
 							*Err = ErrOutOfRange;
 						}
@@ -1831,15 +1619,7 @@
 
 void SetIntVal(TVarId VarId, int Val)
 {
-#if 0
 	if (VarId >> 16) {
-		IntAryVal[(VarId>>16)-1].val[VarId & 0xffff] = Val;
-	}
-	else {
-		IntVal[VarId] = Val;
-	}
-#else
-	if (VarId >> 16) {
 		Variable_t *v = &Variables[(VarId>>16)-1];
 		int *int_val = &v->Value.IntAry.val[VarId & 0xffff];
 		*int_val = Val;
@@ -1848,19 +1628,10 @@
 		Variable_t *v = &Variables[VarId];
 		v->Value.Int = Val;
 	}
-#endif
 }
 
 int CopyIntVal(TVarId VarId)
 {
-#if 0
-	if (VarId >> 16) {
-		return IntAryVal[(VarId>>16)-1].val[VarId & 0xffff];
-	}
-	else {
-		return IntVal[VarId];
-	}
-#else
 	Variable_t *v;
 	if (VarId >> 16) {
 		v = &Variables[(VarId>>16)-1];
@@ -1870,7 +1641,6 @@
 		v = &Variables[VarId];
 		return v->Value.Int;
 	}
-#endif
 }
 
 void GetIntVar(PVarId VarId, LPWORD Err)
@@ -1983,11 +1753,6 @@
 
 void SetStrVal(TVarId VarId, const char *Str)
 {
-#if 0
-	// StrBuf \x82̉^\x97p\x8F\xE3 MaxStrLen \x82\xAA\x90\xB3\x82\xB5\x82\xA2\x83T\x83C\x83Y\x82Ȃ̂ŃT\x83C\x83Y\x82\xF0\x8CŒ\xE8
-	// (2007.6.23 maya)
-	strncpy_s(StrVarPtr(VarId), MaxStrLen, Str, _TRUNCATE);
-#else
 	if (VarId >> 16) {
 		Variable_t *v = &Variables[(VarId>>16)-1];
 		char **str = &v->Value.StrAry.val[VarId & 0xffff];
@@ -2000,19 +1765,10 @@
 		free(*str);
 		*str = strdup(Str);
 	}
-#endif
 }
 
 const char *StrVarPtr(TVarId VarId)
 {
-#if 0
-	if (VarId >> 16) {
-		return StrAryVal[(VarId>>16)-1].val[VarId & 0xffff];
-	}
-	else {
-		return &StrBuff[VarId*MaxStrLen];
-	}
-#else
 	Variable_t *v;
 	if (VarId >> 16) {
 		v = &Variables[(VarId>>16)-1];
@@ -2022,7 +1778,6 @@
 		v = &Variables[VarId];
 		return v->Value.Str;
 	}
-#endif
 }
 
 // for ifdefined (2006.9.23 maya)
@@ -2042,14 +1797,6 @@
 			switch (*ValType) {
 				case TypIntArray:
 					if (GetIndex(&Index, Err)) {
-#if 0
-						if (Index >= 0 && Index < IntAryVal[VarId].size) {
-							*ValType = TypInteger;
-						}
-						else {
-							*ValType = TypUnknown;
-						}
-#else
 						TIntAry *intAry = &Variables[VarId].Value.IntAry;
 						if (Index >= 0 && Index < intAry->size) {
 							*ValType = TypInteger;
@@ -2057,7 +1804,6 @@
 						else {
 							*ValType = TypUnknown;
 						}
-#endif
 					}
 					break;
 				case TypStrArray:
@@ -2104,14 +1850,6 @@
 
 TVarId GetIntVarFromArray(TVarId VarId, int Index, LPWORD Err)
 {
-#if 0
-	if (Index < 0 || Index >= IntAryVal[VarId].size) {
-		*Err = ErrOutOfRange;
-		return -1;
-	}
-	*Err = 0;
-	return ((VarId+1) << 16) | Index;
-#else
 	TIntAry *intAry = &Variables[VarId].Value.IntAry;
 	if (Index < 0 || Index >= intAry->size) {
 		*Err = ErrOutOfRange;
@@ -2119,19 +1857,10 @@
 	}
 	*Err = 0;
 	return ((VarId+1) << 16) | Index;
-#endif
 }
 
 TVarId GetStrVarFromArray(TVarId VarId, int Index, LPWORD Err)
 {
-#if 0
-	if (Index < 0 || Index >= StrAryVal[VarId].size) {
-		*Err = ErrOutOfRange;
-		return -1;
-	}
-	*Err = 0;
-	return ((VarId+1) << 16) | Index;
-#else
 	TStrAry *strAry = &Variables[VarId].Value.StrAry;
 	if (Index < 0 || Index >= strAry->size) {
 		*Err = ErrOutOfRange;
@@ -2139,7 +1868,6 @@
 	}
 	*Err = 0;
 	return ((VarId+1) << 16) | Index;
-#endif
 }
 
 void GetAryVar(PVarId VarId, WORD VarType, LPWORD Err)
@@ -2192,20 +1920,12 @@
 
 int GetIntAryVarSize(TVarId VarId)
 {
-#if 0
-	return IntAryVal[VarId].size;
-#else
 	TIntAry *intAry = &Variables[VarId].Value.IntAry;
 	return intAry->size;
-#endif
 }
 
 int GetStrAryVarSize(TVarId VarId)
 {
-#if 0
-	return StrAryVal[VarId].size;
-#else
 	TIntAry *strAry = &Variables[VarId].Value.IntAry;
 	return strAry->size;
-#endif
 }

• 前の記事 (スレッド) [Ttssh2-commit] [8705] StrVarPtr() の戻り値を char * から const char * に変更
• 次の記事 (スレッド) [Ttssh2-commit] [8707] ttmparse.cppにリネーム
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]