OSDN > 브라 우즈 소프트웨어 > Terminals > Serial > Tera Term > SCM > SVN > Commit

Tera Term

ttssh2: Commit

ToCharW(),ToCharA(),ToWcharA()などでNULLポインタを渡せるようにした

- NULLを渡すと、NULLポインタが返る

--- trunk/teraterm/common/codeconv.cpp (revision 8302)

+++ trunk/teraterm/common/codeconv.cpp (revision 8303)

		@@ -930,6 +930,7 @@
930	930
931	931	char ToCharW(const wchar_t strW)
932	932	{
	933	+ if (strW == NULL) return NULL;
933	934	char *strA = _WideCharToMultiByte(strW, 0, CP_ACP, NULL);
934	935	return strA;
935	936	}

		@@ -936,11 +937,13 @@
936	937
937	938	char ToCharA(const char strA)
938	939	{
	940	+ if (strA == NULL) return NULL;
939	941	return _strdup(strA);
940	942	}
941	943
942	944	char ToCharU8(const char strU8)
943	945	{
	946	+ if (strU8 == NULL) return NULL;
944	947	wchar_t *strW = _MultiByteToWideChar(strU8, 0, CP_UTF8, NULL);
945	948	if (strW == NULL) {
946	949	return NULL;

		@@ -952,6 +955,7 @@
952	955
953	956	wchar_t ToWcharA(const char strA)
954	957	{
	958	+ if (strA == NULL) return NULL;
955	959	wchar_t *strW = _MultiByteToWideChar(strA, 0, CP_ACP, NULL);
956	960	return strW;
957	961	}

		@@ -958,11 +962,13 @@
958	962
959	963	wchar_t ToWcharW(const wchar_t strW)
960	964	{
	965	+ if (strW == NULL) return NULL;
961	966	return _wcsdup(strW);
962	967	}
963	968
964	969	wchar_t ToWcharU8(const char strU8)
965	970	{
	971	+ if (strU8 == NULL) return NULL;
966	972	wchar_t *strW = _MultiByteToWideChar(strU8, 0, CP_UTF8, NULL);
967	973	return strW;
968	974	}

		@@ -969,6 +975,7 @@
969	975
970	976	char ToU8W(const wchar_t strW)
971	977	{
	978	+ if (strW == NULL) return NULL;
972	979	char *strU8 = _WideCharToMultiByte(strW, 0, CP_UTF8, NULL);
973	980	return strU8;
974	981	}

		@@ -975,6 +982,7 @@
975	982
976	983	char ToU8A(const char strA)
977	984	{
	985	+ if (strA == NULL) return NULL;
978	986	wchar_t *strW = _MultiByteToWideChar(strA, 0, CP_ACP, NULL);
979	987	if (strW == NULL) {
980	988	return NULL;