From f1ef5df1f9b49008532aa47dfdb908397bd517c2 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, 28 Jun 2017 08:29:40 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@524 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/containers/pideque.h | 2 +- src_main/io/piconnection.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src_main/containers/pideque.h b/src_main/containers/pideque.h index 2ad92d2e..c40a299b 100755 --- a/src_main/containers/pideque.h +++ b/src_main/containers/pideque.h @@ -294,7 +294,7 @@ public: piSwap(pid_data, other.pid_data); piSwap(pid_size, other.pid_size); piSwap(pid_rsize, other.pid_rsize); - piSwap(pid_start, other.pid_start); + piSwap(pid_start, other.pid_start); } typedef int (*CompareFunc)(const T * , const T * ); diff --git a/src_main/io/piconnection.cpp b/src_main/io/piconnection.cpp index 8c0b035c..1b5b65d3 100755 --- a/src_main/io/piconnection.cpp +++ b/src_main/io/piconnection.cpp @@ -873,12 +873,20 @@ int PIConnection::writeByFullPath(const PIString & full_path, const PIByteArray PIString fp = PIIODevice::normalizeFullPath(full_path); PIIODevice * dev = __device_pool__->device(fp); //piCout << "SEND" << full_path << fp; + if (!dev) { + piCoutObj << "No such full path \"" << full_path << "\"!"; + return -1; + } return write(dev, data); } -int PIConnection::writeByName(const PIString & name, const PIByteArray & data) { - PIIODevice * dev = deviceByName(name); +int PIConnection::writeByName(const PIString & name_, const PIByteArray & data) { + PIIODevice * dev = deviceByName(name_); + if (!dev) { + piCoutObj << "No such device \"" << name_ << "\"!"; + return -1; + } return write(dev, data); }