From fc51984d6dbb5c0d469ba001b5422c3adfc5cb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 13 Mar 2019 09:31:34 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@770 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/core/pistring.cpp | 4 ++-- src_main/io_devices/piserial.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src_main/core/pistring.cpp b/src_main/core/pistring.cpp index aafc6fd4..b33a3a70 100755 --- a/src_main/core/pistring.cpp +++ b/src_main/core/pistring.cpp @@ -376,11 +376,11 @@ void PIString::buildData(const char * cp) const { void PIString::trimsubstr(int &st, int &fn) const { for (int i = 0; i < length(); ++i) - if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12)) + if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12) && at(i) != uchar(0)) {st = i; break;} if (st < 0) return; for (int i = length() - 1; i >= 0; --i) - if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12)) + if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12) && at(i) != uchar(0)) {fn = i; break;} } diff --git a/src_main/io_devices/piserial.cpp b/src_main/io_devices/piserial.cpp index 33d58073..cab28cec 100755 --- a/src_main/io_devices/piserial.cpp +++ b/src_main/io_devices/piserial.cpp @@ -793,7 +793,7 @@ PIStringList PISerial::availableDevices(bool test) { DWORD name_len = 1024, data_len = 1024, type = 0; ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len); if (ret == ERROR_NO_MORE_ITEMS) break; - dl << PIString(data, data_len); + dl << PIString(data, data_len).trim(); index++; } RegCloseKey(key);