Tera TermRevision: 10311
https://osdn.net/projects/ttssh2/scm/svn/commits/10311
Author: zmatsuo
Date: 2022-10-13 23:27:02 +0900 (Thu, 13 Oct 2022)
Log Message:
-----------
コンパイラの警告に対応した
- warning: '&&' within '||'
- note: place parentheses around the '&&' expression to silence this warning
- warning: unused function
Modified Paths:
--------------
trunk/teraterm/teraterm/buffer.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2022-10-13 14:26:52 UTC (rev 10310)
+++ trunk/teraterm/teraterm/buffer.c 2022-10-13 14:27:02 UTC (rev 10311)
@@ -207,14 +207,6 @@
}
}
-static void BuffSetChar3(buff_char_t *buff, char32_t u32, unsigned char fg, unsigned char bg, char property)
-{
- buff_char_t *p = buff;
- BuffSetChar2(p, u32, property, TRUE, FALSE);
- p->fg = fg;
- p->bg = bg;
-}
-
static void BuffSetChar4(buff_char_t *buff, char32_t u32, unsigned char fg, unsigned char bg, unsigned char attr, unsigned char attr2, char property)
{
buff_char_t *p = buff;
@@ -1867,6 +1859,7 @@
* @retval TRUE \x83}\x83b\x83`\x82\xB5\x82\xBD
* @retval FALSE \x83}\x83b\x83`\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
*/
+#if 0
static BOOL MatchStringPtr(const buff_char_t *b, const wchar_t *str, BOOL LineContinued)
{
int x;
@@ -1919,6 +1912,7 @@
return result;
}
+#endif
/**
* (x,y)\x82\xA9\x82\xE7 str\x82Ɠ\xAF\x88ꂩ\x92\xB2\x82ׂ\xE9
@@ -4021,8 +4015,8 @@
b = CodeBuffW[TmpPtr+IStart].ansi_char;
DBCS = (CodeBuffW[TmpPtr+IStart].attr & AttrKanji) != 0;
while ((b==CodeBuffW[TmpPtr+IStart].ansi_char) ||
- DBCS &&
- ((CodeBuffW[TmpPtr+IStart].attr & AttrKanji)!=0)) {
+ (DBCS &&
+ ((CodeBuffW[TmpPtr+IStart].attr & AttrKanji)!=0))) {
MoveCharPtr(TmpPtr,&IStart,-1); // move left
if (ts.EnableContinuedLineCopy) {
if (IStart<=0) {
@@ -4063,8 +4057,8 @@
TmpPtr = GetLinePtr(YEnd);
i = 1;
while (((b==CodeBuffW[TmpPtr+IEnd].ansi_char) ||
- DBCS &&
- ((CodeBuffW[TmpPtr+IEnd].attr & AttrKanji)!=0))) {
+ (DBCS &&
+ ((CodeBuffW[TmpPtr+IEnd].attr & AttrKanji)!=0)))) {
i = MoveCharPtr(TmpPtr,&IEnd,1); // move right
if (ts.EnableContinuedLineCopy) {
if (i==0) {
@@ -4378,8 +4372,8 @@
DBCS = (CodeBuffW[TmpPtr+X].attr & AttrKanji) != 0;
while ((i!=0) &&
((b==CodeBuffW[TmpPtr+SelectEnd.x].ansi_char) ||
- DBCS &&
- ((CodeBuffW[TmpPtr+SelectEnd.x].attr & AttrKanji)!=0))) {
+ (DBCS &&
+ ((CodeBuffW[TmpPtr+SelectEnd.x].attr & AttrKanji)!=0)))) {
i = MoveCharPtr(TmpPtr,(int *)&SelectEnd.x,1); // move right
}
}
@@ -4406,8 +4400,8 @@
DBCS = (CodeBuffW[TmpPtr+SelectEnd.x].attr & AttrKanji) != 0;
while ((SelectEnd.x>0) &&
((b==CodeBuffW[TmpPtr+SelectEnd.x].ansi_char) ||
- DBCS &&
- ((CodeBuffW[TmpPtr+SelectEnd.x].attr & AttrKanji)!=0))) {
+ (DBCS &&
+ ((CodeBuffW[TmpPtr+SelectEnd.x].attr & AttrKanji)!=0)))) {
MoveCharPtr(TmpPtr,(int *)&SelectEnd.x,-1); // move left
}
if ((b!=CodeBuffW[TmpPtr+SelectEnd.x].ansi_char) &&