From 8f85d2887cfa9276311dc8dc577aca373ac44fb3 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 6 Feb 2002 02:23:17 +0000
Subject: [PATCH] cosmetic

---
 src/ca/caProto.h            | 1 +
 src/ca/cac.cpp              | 5 ++---
 src/ca/casw.cpp             | 2 +-
 src/ca/oldChannelNotify.cpp | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/ca/caProto.h b/src/ca/caProto.h
index 5dfcac50a..7b4dc4fb5 100644
--- a/src/ca/caProto.h
+++ b/src/ca/caProto.h
@@ -83,6 +83,7 @@
 #define CA_PORT_BASE            IPPORT_USERRESERVED + 56U
 #define CA_SERVER_PORT          (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u)
 #define CA_REPEATER_PORT        (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u+1u)
+
 /* 
  * 1500 (max of ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP) 
  * (the MTU of Ethernet is currently independent of its speed varient)
diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index 356752991..1d8ef7fad 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -749,7 +749,6 @@ bool cac::lookupChannelAndTransferToTCP ( unsigned cid, unsigned sid,
              const epicsTime & currentTime )
 {
     tcpiiu * pnewiiu = 0;
-    unsigned short retrySeqNumber;
 
     if ( addr.sa.sa_family != AF_INET ) {
         return false;
@@ -768,7 +767,7 @@ bool cac::lookupChannelAndTransferToTCP ( unsigned cid, unsigned sid,
             return true;
         }
 
-        retrySeqNumber = chan->getRetrySeqNo ();
+        unsigned short retrySeqNumber = chan->getRetrySeqNo ();
 
         /*
          * Ignore duplicate search replies
@@ -980,7 +979,7 @@ void cac::writeRequest ( nciu &chan, unsigned type, unsigned nElem, const void *
     chan.getPIIU()->writeRequest ( chan, type, nElem, pValue );
 }
 
-cacChannel::ioid
+cacChannel::ioid 
 cac::writeNotifyRequest ( nciu &chan, unsigned type, unsigned nElem, // X aCC 361
                           const void *pValue, cacWriteNotify &notifyIn )
 {
diff --git a/src/ca/casw.cpp b/src/ca/casw.cpp
index a5f16f676..63315ed17 100644
--- a/src/ca/casw.cpp
+++ b/src/ca/casw.cpp
@@ -104,7 +104,7 @@ int main ( int, char ** )
     }
 
     resTable < bhe, inetAddrID > beaconTable;
-    while ( 1 ) {
+    while ( true ) {
 
         addrSize = ( osiSocklen_t ) sizeof ( addr );
         status = recvfrom ( sock, buf, sizeof ( buf ), 0,
diff --git a/src/ca/oldChannelNotify.cpp b/src/ca/oldChannelNotify.cpp
index 2be828334..9936428c7 100644
--- a/src/ca/oldChannelNotify.cpp
+++ b/src/ca/oldChannelNotify.cpp
@@ -43,9 +43,8 @@ extern "C" void cacNoopAccesRightsHandler ( struct access_rights_handler_args )
 }
 
 oldChannelNotify::oldChannelNotify ( oldCAC & cacIn, const char *pName, 
-    caCh * pConnCallBackIn, void * pPrivateIn, capri priority ) :
-    io ( cacIn.createChannel ( pName, *this, priority ) ), 
-    cacCtx ( cacIn ), 
+        caCh * pConnCallBackIn, void * pPrivateIn, capri priority ) :
+    io ( cacIn.createChannel ( pName, *this, priority ) ), cacCtx ( cacIn ), 
     pConnCallBack ( pConnCallBackIn ? pConnCallBackIn : cacNoopConnHandler ), 
     pPrivate ( pPrivateIn ), pAccessRightsFunc ( cacNoopAccesRightsHandler )
 {