From: sdottaka <sdottaka@users.sourceforge.net>
Date: Wed, 18 Feb 2015 01:32:43 +0000 (+0900)
Subject: ccrystaltextview2.cpp: C6305	Mismatched size and count
X-Git-Tag: 2.16.4+-jp-10~919^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6339e81224d4f6263cddfaeef93417cf3c21466;p=winmerge-jp%2Fwinmerge-jp.git

ccrystaltextview2.cpp: C6305	Mismatched size and count
VSSHelper.cpp: C6305	Mismatched size and count

--HG--
branch : stable
---

diff --git a/Externals/crystaledit/editlib/ccrystaltextview2.cpp b/Externals/crystaledit/editlib/ccrystaltextview2.cpp
index 96c1db899..44b464de3 100644
--- a/Externals/crystaledit/editlib/ccrystaltextview2.cpp
+++ b/Externals/crystaledit/editlib/ccrystaltextview2.cpp
@@ -1157,7 +1157,7 @@ PutToClipboard (LPCTSTR pszText, int cchText, bool bColumnSelection)
           LPTSTR pszData = (LPTSTR)::GlobalLock (hData);
           memcpy (pszData, pszText, cbData);
 		  if (dwSize > cbData)
-			  memset(pszData + cbData, 0, dwSize - cbData);
+			  memset(reinterpret_cast<char *>(pszData) + cbData, 0, dwSize - cbData);
           GlobalUnlock (hData);
           UINT fmt = GetClipTcharTextFormat();
           bOK = SetClipboardData (fmt, hData) != NULL;
diff --git a/Src/VSSHelper.cpp b/Src/VSSHelper.cpp
index cd0618edc..f1bdfc95c 100644
--- a/Src/VSSHelper.cpp
+++ b/Src/VSSHelper.cpp
@@ -248,11 +248,11 @@ bool VSSHelper::GetWordFromFile(HANDLE pfile, TCHAR * buffer,
 	return true;
 }
 
-int VSSHelper::GetWordFromBuffer(TCHAR *inBuffer, DWORD dwInBufferSize,
-		TCHAR * outBuffer, DWORD dwOutBufferSize, TCHAR * charset) const
+int VSSHelper::GetWordFromBuffer(const TCHAR *inBuffer, DWORD dwInBufferSize,
+		TCHAR * outBuffer, DWORD dwOutBufferSize, const TCHAR * charset) const
 {
 	TCHAR ctemp = '\0';
-	TCHAR * pcharset = NULL;
+	const TCHAR * pcharset = NULL;
 	UINT buffercount = 0;
 	DWORD numread = sizeof(ctemp);
 	bool delimword = false;
@@ -323,7 +323,7 @@ int VSSHelper::GetWordFromBuffer(TCHAR *inBuffer, DWORD dwInBufferSize,
 				break;
 		}
 	
-		inBuffer += sizeof(TCHAR);
+		++inBuffer;
 	}
 	if (buffercount >= dwOutBufferSize || numread == 0)
 		return 0;
diff --git a/Src/VSSHelper.h b/Src/VSSHelper.h
index f99c33f4b..4802e772b 100644
--- a/Src/VSSHelper.h
+++ b/Src/VSSHelper.h
@@ -42,8 +42,8 @@ public:
 
 protected:
 	bool GetWordFromFile(HANDLE pfile, TCHAR * buffer, DWORD dwBufferSize, TCHAR * charset = NULL) const;
-	int GetWordFromBuffer(TCHAR * inBuffer, DWORD dwInBufferSize,
-		TCHAR * outBuffer, DWORD dwOutBufferSize, TCHAR * charset = NULL) const;
+	int GetWordFromBuffer(const TCHAR * inBuffer, DWORD dwInBufferSize,
+		TCHAR * outBuffer, DWORD dwOutBufferSize, const TCHAR * charset = NULL) const;
 	bool GetVCProjName(HANDLE hFile, HANDLE tFile) const;
 	bool GetSLNProjUniqueName(HANDLE hFile, HANDLE tFile, TCHAR * buf) const;
 	bool GetSLNProjName(HANDLE hFile, HANDLE tFile, TCHAR * buf) const;