cosmetic

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)

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 )
 {

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,

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 )
 {