Tera TermRevision: 9116
https://osdn.net/projects/ttssh2/scm/svn/commits/9116
Author: zmatsuo
Date: 2020-12-29 00:37:47 +0900 (Tue, 29 Dec 2020)
Log Message:
-----------
コンパイラ警告対策
- size_t は unsigned なので、常に0または+の値となる
- >= 0 や < 0 などの常に成り立つ条件式を削除
- warning: comparison of unsigned expression in '< 0' is always false [-Wtype-limits]
- switch() 内の break なし部分に FALLTHROUGH 追加
Modified Paths:
--------------
trunk/TTProxy/ProxyWSockHook.h
trunk/TTProxy/YCL/include/YCL/String.h
trunk/TTProxy/YCL/include/YCL/StringBuffer.h
-------------- next part --------------
Modified: trunk/TTProxy/ProxyWSockHook.h
===================================================================
--- trunk/TTProxy/ProxyWSockHook.h 2020-12-28 14:29:48 UTC (rev 9115)
+++ trunk/TTProxy/ProxyWSockHook.h 2020-12-28 15:37:47 UTC (rev 9116)
@@ -1065,7 +1065,7 @@
ProxyInfo proxy;
SettingDialog():lock(false) {
}
-
+
int open(HWND owner) {
return Dialog::open(instance().resource_module, IDD_SETTING, owner);
}
@@ -1243,7 +1243,7 @@
if (WSAGetLastError() != WSAEWOULDBLOCK) {
return SOCKET_ERROR;
}
- // no break
+ /* FALLTHROUGH */ // no break
case 0:
end = dst; /* end of stream */
break;
Modified: trunk/TTProxy/YCL/include/YCL/String.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/String.h 2020-12-28 14:29:48 UTC (rev 9115)
+++ trunk/TTProxy/YCL/include/YCL/String.h 2020-12-28 15:37:47 UTC (rev 9116)
@@ -242,9 +242,7 @@
// \x95Ԓl:
// \x95\xB6\x8E\x9A\x82̌\xA9\x82\xA9\x82\xC1\x82\xBD\x83C\x83\x93\x83f\x83b\x83N\x83X\x81B\x8C\xA9\x82\xA9\x82\xE7\x82Ȃ\xAF\x82\xEA\x82\xCE-1\x81B
int indexOf(char chr, size_t from)const {
- if (from < 0)
- from = 0;
- else if (from >= length())
+ if (from >= length())
return -1;
const char* found = strchr(string + from, chr);
if (found == NULL)
@@ -267,9 +265,7 @@
// \x95\xB6\x8E\x9A\x97\xF1\x82̌\xA9\x82\xA9\x82\xC1\x82\xBD\x83C\x83\x93\x83f\x83b\x83N\x83X\x81B\x8C\xA9\x82\xA9\x82\xE7\x82Ȃ\xAF\x82\xEA\x82\xCE-1\x81B
//
int indexOf(const char* str, size_t from)const {
- if (from < 0)
- from = 0;
- else if (from >= length())
+ if (from >= length())
return -1;
const char* found = strstr(string + from, str);
if (found == NULL)
@@ -360,7 +356,7 @@
// \x95Ԓl:
// \x8Ew\x92\xE8\x82̈ʒu\x82ɂ\xA0\x82镶\x8E\x9A\x81B
char charAt(size_t index)const {
- return index >= 0 && index < length() ? string[index] : '\0';
+ return index < length() ? string[index] : '\0';
}
// \x8Ew\x92\xE8\x82̕\xB6\x8E\x9A\x82\xF0\x8Ew\x92\xE8\x82̕\xB6\x8E\x9A\x82ɒu\x82\xAB\x8A\xB7\x82\xA6\x82܂\xB7\x81B
// \x88\xF8\x90\x94:
Modified: trunk/TTProxy/YCL/include/YCL/StringBuffer.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/StringBuffer.h 2020-12-28 14:29:48 UTC (rev 9115)
+++ trunk/TTProxy/YCL/include/YCL/StringBuffer.h 2020-12-28 15:37:47 UTC (rev 9116)
@@ -43,7 +43,9 @@
}else{
buffer = new char[bufferSize];
}
- memcpy(buffer, source, validLength);
+ if (source != NULL) {
+ memcpy(buffer, source, validLength);
+ }
memset(buffer + validLength, '\0', bufferSize - validLength);
}
public:
@@ -110,7 +112,7 @@
// \x95Ԓl:
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x81B
char charAt(size_t index)const {
- return index >= 0 && index < validLength ? buffer[index] : '\0';
+ return index < validLength ? buffer[index] : '\0';
}
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
// \x88\xF8\x90\x94:
@@ -118,9 +120,7 @@
// \x95Ԓl:
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x82̎Q\x8FƁB
char& charAt(size_t index) {
- if (index < 0) {
- index = 0;
- }else if (index >= validLength) {
+ if (index >= validLength) {
ensureCapacity(validLength + 1);
index = validLength++;
}
@@ -178,8 +178,6 @@
// \x95Ԓl:
// \x8D폜\x8C\x8B\x89ʁB
StringBuffer& remove(size_t start, size_t end) {
- if (start <= 0)
- start = 0;
if (start < end) {
if (end < validLength){
memcpy(buffer + start, buffer + end, validLength - end);
@@ -198,8 +196,6 @@
// \x95Ԓl:
// \x92u\x8A\xB7\x8C\x8B\x89ʁB
StringBuffer& replace(size_t start, size_t end, const char* source) {
- if (start < 0)
- start = 0;
if (end > validLength)
end = validLength;
if (start < end) {
@@ -217,8 +213,6 @@
// \x95Ԓl:
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x97\xF1\x81B
String substring(size_t index)const {
- if (index < 0)
- index = 0;
return String(buffer + index, validLength - index);
}
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
@@ -228,8 +222,6 @@
// \x95Ԓl:
// \x8Ew\x92\xE8\x82̈ʒu\x82̕\xB6\x8E\x9A\x97\xF1\x81B
String substring(size_t start, size_t end)const {
- if (start < 0)
- start = 0;
if (end > validLength)
end = validLength;
return String(buffer + start, end - start);
@@ -260,9 +252,7 @@
// \x95Ԓl:
// \x91}\x93\xFC\x8C\x8B\x89ʁB
StringBuffer& insert(size_t index, const char* source, size_t length) {
- if (index < 0)
- index = 0;
- else if (index >= validLength)
+ if (index >= validLength)
index = validLength;
size_t oldLength = validLength;
ensureCapacity(validLength + length);