From c31a4ed7ea33d6530c7c8adaafed52a69c8c6f51 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Wed, 28 Mar 2012 20:36:21 +0200
Subject: [PATCH] Dirk's VxWorks port II.

---
 pvAccessApp/remote/blockingTCP.h            | 2 +-
 pvAccessApp/remote/blockingTCPTransport.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pvAccessApp/remote/blockingTCP.h b/pvAccessApp/remote/blockingTCP.h
index f974307..23c0618 100644
--- a/pvAccessApp/remote/blockingTCP.h
+++ b/pvAccessApp/remote/blockingTCP.h
@@ -35,7 +35,7 @@ namespace epics {
         //class MonitorSender;
 
         enum ReceiveStage {
-            READ_FROM_SOCKET, PROCESS_HEADER, PROCESS_PAYLOAD, NONE
+            READ_FROM_SOCKET, PROCESS_HEADER, PROCESS_PAYLOAD, UNDEFINED_STAGE
         };
 
         enum SendQueueFlushStrategy {
diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp
index f33eb70..51c18d6 100644
--- a/pvAccessApp/remote/blockingTCPTransport.cpp
+++ b/pvAccessApp/remote/blockingTCPTransport.cpp
@@ -464,7 +464,7 @@ namespace pvAccess {
                 _socketBuffer->setLimit(_storedLimit);
 
                 _stage = PROCESS_HEADER;
-                processReadCached(true, NONE, size-remainingBytes);
+                processReadCached(true, UNDEFINED_STAGE, size-remainingBytes);
 
                 // copy before position
                 for(int i = remainingBytes-1, j = _socketBuffer->getPosition()
@@ -499,7 +499,7 @@ namespace pvAccess {
                 ReceiveStage inStage, int requiredBytes) {
             try {
                 while(likely(!_closed.get())) {
-                    if(_stage==READ_FROM_SOCKET||inStage!=NONE) {
+                    if(_stage==READ_FROM_SOCKET||inStage!=UNDEFINED_STAGE) {
 
                         // add to bytes read
                         int currentPosition = _socketBuffer->getPosition();
@@ -565,7 +565,7 @@ namespace pvAccess {
                         aliveNotification();
 
                         // exit
-                        if(inStage!=NONE) return;
+                        if(inStage!=UNDEFINED_STAGE) return;
 
                         _stage = PROCESS_HEADER;
                     }
@@ -962,7 +962,7 @@ namespace pvAccess {
             Transport::shared_pointer ptr = obj->shared_from_this();    // hold reference
 
 try{
-            obj->processReadCached(false, NONE, CA_MESSAGE_HEADER_SIZE);
+            obj->processReadCached(false, UNDEFINED_STAGE, CA_MESSAGE_HEADER_SIZE);
 } catch (...) {
 printf("rcvThreadRunnner exception\n");
 }