From 5f6319ed3d5799c542a6c99e6450199c22e0770f Mon Sep 17 00:00:00 2001
From: zimoch <zimoch>
Date: Fri, 20 Sep 2013 09:52:43 +0000
Subject: [PATCH] stay at version 2.6

---
 src/StreamBusInterface.h | 42 +++++++++++-----------------------------
 src/devStream.h          |  4 ++--
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/StreamBusInterface.h b/src/StreamBusInterface.h
index 6a336ba..74dfcad 100644
--- a/src/StreamBusInterface.h
+++ b/src/StreamBusInterface.h
@@ -52,62 +52,42 @@ public:
     protected:
         StreamBusInterface* businterface;
         bool busSupportsEvent() {
-            if (businterface)
-                return businterface->supportsEvent();
-            else return false;
+            return businterface && businterface->supportsEvent();
         }
         bool busSupportsAsyncRead() {
-            if (businterface)
-                return businterface->supportsAsyncRead();
-            else return false;
+            return businterface && businterface->supportsAsyncRead();
         }
         bool busAcceptEvent(unsigned long mask,
             unsigned long replytimeout_ms) {
-            if (businterface)
-                return businterface->acceptEvent(mask, replytimeout_ms);
-            else return false;
+            return businterface && businterface->acceptEvent(mask, replytimeout_ms);
         }
         void busRelease() {
-            if (businterface)
-                businterface->release();
+            if (businterface) businterface->release();
         }
         bool busLockRequest(unsigned long timeout_ms) {
-            if (businterface)
-                return businterface->lockRequest(timeout_ms);
-            else return false;
+            return businterface && businterface->lockRequest(timeout_ms);
         }
         bool busUnlock() {
-            if (businterface)
-                return businterface->unlock();
-            else return false;
+            return businterface && businterface->unlock();
         }
         bool busWriteRequest(const void* output, size_t size,
             unsigned long timeout_ms) {
-            if (businterface)
-                return businterface->writeRequest(output, size, timeout_ms);
-            else return false;
+            return businterface && businterface->writeRequest(output, size, timeout_ms);
         }
         bool busReadRequest(unsigned long replytimeout_ms,
             unsigned long readtimeout_ms, long expectedLength,
             bool async) {
-            if (businterface)
-                return businterface->readRequest(replytimeout_ms,
+            return businterface && businterface->readRequest(replytimeout_ms,
                     readtimeout_ms, expectedLength, async);
-            else return false;
         }
         void busFinish() {
-            if (businterface)
-                businterface->finish();
+            if (businterface) businterface->finish();
         }
         bool busConnectRequest(unsigned long timeout_ms) {
-            if (businterface)
-                return businterface->connectRequest(timeout_ms);
-            else return false;
+            return businterface && businterface->connectRequest(timeout_ms);
         }
         bool busDisconnect() {
-            if (businterface)
-                return businterface->disconnectRequest();
-            else return false;
+            return businterface && businterface->disconnectRequest();
         }
     };
 
diff --git a/src/devStream.h b/src/devStream.h
index 7f700b7..7f1bc25 100644
--- a/src/devStream.h
+++ b/src/devStream.h
@@ -22,8 +22,8 @@
 #define devStream_h
 
 #define STREAM_MAJOR 2
-#define STREAM_MINOR 7
-#define STREAM_PATCHLEVEL 0
+#define STREAM_MINOR 6
+#define STREAM_PATCHLEVEL 3
 
 #if defined(__vxworks) || defined(vxWorks)
 #include <vxWorks.h>