svnno****@sourc*****
svnno****@sourc*****
2015年 12月 8日 (火) 00:14:08 JST
Tera TermRevision: 6197
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6197
Author: yutakapon
Date: 2015-12-08 00:14:08 +0900 (Tue, 08 Dec 2015)
Log Message:
-----------
チケット #35744 VS2015の警告除去
データ型の違いによる警告を除去した。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/35744
Modified Paths:
--------------
branches/vs2015_warn/teraterm/teraterm/keyboard.c
branches/vs2015_warn/teraterm/teraterm/vtwin.cpp
branches/vs2015_warn/teraterm/ttpfile/kermit.c
branches/vs2015_warn/teraterm/ttpmacro/ttl.c
branches/vs2015_warn/teraterm/ttpmacro/ttmbuff.c
branches/vs2015_warn/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: branches/vs2015_warn/teraterm/teraterm/keyboard.c
===================================================================
--- branches/vs2015_warn/teraterm/teraterm/keyboard.c 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/teraterm/keyboard.c 2015-12-07 15:14:08 UTC (rev 6197)
@@ -754,7 +754,7 @@
break;
case IdCommand:
Code[CodeLength] = 0;
- if (sscanf(Code, "%d", &wId) == 1)
+ if (sscanf(Code, "%hd", &wId) == 1)
PostMessage(HWin,WM_COMMAND,MAKELONG(wId,0),0);
break;
}
Modified: branches/vs2015_warn/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/vs2015_warn/teraterm/teraterm/vtwin.cpp 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/teraterm/vtwin.cpp 2015-12-07 15:14:08 UTC (rev 6197)
@@ -282,7 +282,7 @@
return;
}
- hc = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(name), IMAGE_CURSOR,
+ hc = (HCURSOR)LoadImage(NULL, (LPCTSTR)MAKEINTRESOURCE(name), IMAGE_CURSOR,
0, 0, LR_DEFAULTSIZE | LR_SHARED);
if (hc != NULL) {
Modified: branches/vs2015_warn/teraterm/ttpfile/kermit.c
===================================================================
--- branches/vs2015_warn/teraterm/ttpfile/kermit.c 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/ttpfile/kermit.c 2015-12-07 15:14:08 UTC (rev 6197)
@@ -1040,12 +1040,12 @@
}
if ( (kv->FileAttrFlag & KMT_ATTR_MODE) != 0 ) {
_snprintf_s(t, sizeof(t), _TRUNCATE, "%03o", kv->FileMode & 0777);
- _snprintf_s(s, sizeof(s), _TRUNCATE, ",%c%s", KmtChar(strlen(t)), t);
+ _snprintf_s(s, sizeof(s), _TRUNCATE, ",%c%s", KmtChar((BYTE)strlen(t)), t);
strncat_s(buf, sizeof(buf), s, _TRUNCATE);
}
if ( (kv->FileAttrFlag & KMT_ATTR_SIZE) != 0 ) {
_snprintf_s(t, sizeof(t), _TRUNCATE, "%I64d", kv->FileSize);
- _snprintf_s(s, sizeof(s), _TRUNCATE, "1%c%s", KmtChar(strlen(t)), t);
+ _snprintf_s(s, sizeof(s), _TRUNCATE, "1%c%s", KmtChar((BYTE)strlen(t)), t);
strncat_s(buf, sizeof(buf), s, _TRUNCATE);
}
Modified: branches/vs2015_warn/teraterm/ttpmacro/ttl.c
===================================================================
--- branches/vs2015_warn/teraterm/ttpmacro/ttl.c 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/ttpmacro/ttl.c 2015-12-07 15:14:08 UTC (rev 6197)
@@ -1158,7 +1158,7 @@
return ErrSyntax;
strncpy_s(LineBuff, sizeof(LineBuff),NextLine, _TRUNCATE);
- LineLen = strlen(LineBuff);
+ LineLen = (WORD)strlen(LineBuff);
LinePtr = 0;
b = GetFirstChar();
LinePtr--;
Modified: branches/vs2015_warn/teraterm/ttpmacro/ttmbuff.c
===================================================================
--- branches/vs2015_warn/teraterm/ttpmacro/ttmbuff.c 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/ttpmacro/ttmbuff.c 2015-12-07 15:14:08 UTC (rev 6197)
@@ -268,7 +268,7 @@
b = (Buff[INest])[BuffPtr[INest]];
}
LinePtr = 0;
- LineLen = strlen(LineBuff);
+ LineLen = (WORD)strlen(LineBuff);
LineParsePtr = 0;
// current line number (2005.7.18 yutaka)
Modified: branches/vs2015_warn/teraterm/ttpset/ttset.c
===================================================================
--- branches/vs2015_warn/teraterm/ttpset/ttset.c 2015-12-07 13:44:13 UTC (rev 6196)
+++ branches/vs2015_warn/teraterm/ttpset/ttset.c 2015-12-07 15:14:08 UTC (rev 6197)
@@ -3091,7 +3091,7 @@
Num = 0xFFFF;
else if (_stricmp(Temp, "off") == 0)
Num = 0xFFFF;
- else if (sscanf(Temp, "%d", &Num) != 1)
+ else if (sscanf(Temp, "%hd", &Num) != 1)
Num = 0xFFFF;
KeyMap->Map[KeyId - 1] = Num;
@@ -3566,7 +3566,7 @@
} while (b != '\0' && b != ':');
if (b == ':') {
s[i - 1] = '\0';
- if (sscanf(&(s[i]), "%d", port) != 1)
+ if (sscanf(&(s[i]), "%hd", port) != 1)
*port = 65535;
is_port = 1;
}
@@ -3773,7 +3773,7 @@
}
else if (_strnicmp(Temp, "/P=", 3) == 0) { /* TCP port num */
ParamPort = IdTCPIP;
- if (sscanf(&Temp[3], "%d", &ParamTCP) != 1)
+ if (sscanf(&Temp[3], "%hd", &ParamTCP) != 1)
ParamTCP = 65535;
}
else if (_strnicmp(Temp, "/R=", 3) == 0) { /* Replay filename */