diff --git a/modules/ca/src/client/access.cpp b/modules/ca/src/client/access.cpp index 9c94d61c5..58cc4bca5 100644 --- a/modules/ca/src/client/access.cpp +++ b/modules/ca/src/client/access.cpp @@ -88,7 +88,7 @@ const char * ca_message_text [] "Bad event subscription (monitor) identifier", "Remote channel has new network address", "New or resumed network connection", -"Specified task isnt a member of a CA context", +"Specified task isn't a member of a CA context", "Attempt to use defunct CA feature failed", "The supplied string is empty", @@ -324,7 +324,7 @@ int epicsStdCall ca_create_channel ( *chanptr = pChanNotify; pChanNotify->initiateConnect ( guard ); // no need to worry about a connect preempting here because - // the connect sequence will not start untill initiateConnect() + // the connect sequence will not start until initiateConnect() // is called } catch ( cacChannel::badString & ) { @@ -384,9 +384,9 @@ int epicsStdCall ca_clear_channel ( chid pChan ) // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( cac.cbMutex ); epicsGuard < epicsMutex > guard ( cac.mutex ); @@ -720,7 +720,7 @@ int epicsStdCall ca_context_status ( ca_client_context * pcac, unsigned level ) /* * ca_current_context () * - * used when an auxillary thread needs to join a CA client context started + * used when an auxiliary thread needs to join a CA client context started * by another thread */ // extern "C" @@ -740,7 +740,7 @@ struct ca_client_context * epicsStdCall ca_current_context () /* * ca_attach_context () * - * used when an auxillary thread needs to join a CA client context started + * used when an auxiliary thread needs to join a CA client context started * by another thread */ // extern "C" diff --git a/modules/ca/src/client/acctst.c b/modules/ca/src/client/acctst.c index 83d848f12..34298680c 100644 --- a/modules/ca/src/client/acctst.c +++ b/modules/ca/src/client/acctst.c @@ -494,7 +494,7 @@ void verifyConnectionHandlerConnect ( appChan *pChans, unsigned chanCount, /* * verifyBlockingConnect () * - * 1) verify that we dont print a disconnect message when + * 1) verify that we don't print a disconnect message when * we delete the last channel * * 2) verify that we delete the connection to the IOC @@ -645,7 +645,7 @@ void verifyBlockingConnect ( appChan *pChans, unsigned chanCount, status = ca_pend_io ( 1e-16 ); if ( status == ECA_TIMEOUT ) { /* - * we end up here if the channel isnt on the same host + * we end up here if the channel isn't on the same host */ epicsThreadSleep ( 0.1 ); ca_poll (); @@ -1112,7 +1112,7 @@ void verifyHighThroughputRead ( chid chan, unsigned interestLevel ) unsigned i; /* - * verify we dont jam up on many uninterrupted + * verify we don't jam up on many uninterrupted * solicitations */ if ( ca_read_access (chan) ) { @@ -1152,7 +1152,7 @@ void verifyHighThroughputWrite ( chid chan, unsigned interestLevel ) } /* - * verify we dont jam up on many uninterrupted + * verify we don't jam up on many uninterrupted * get callback requests */ void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel ) @@ -1181,7 +1181,7 @@ void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel ) } /* - * verify we dont jam up on many uninterrupted + * verify we don't jam up on many uninterrupted * put callback request */ void verifyHighThroughputWriteCallback ( chid chan, unsigned interestLevel ) @@ -1239,7 +1239,7 @@ void verifyBadString ( chid chan, unsigned interestLevel ) verify ( status == ECA_NORMAL ); if ( strcmp ( stimStr, respStr ) ) { printf ( - "Test fails if stim \"%s\" isnt roughly equiv to resp \"%s\"\n", + "Test fails if stim \"%s\" isn't roughly equiv to resp \"%s\"\n", stimStr, respStr); } showProgressEnd ( interestLevel ); @@ -1395,7 +1395,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm ) /* * raise the priority of the current thread hoping to improve our - * likelyhood of detecting a bug + * likelihood of detecting a bug */ priorityOfTestThread = epicsThreadGetPrioritySelf (); epicsThreadSetPriority ( epicsThreadGetIdSelf(), epicsThreadPriorityHigh ); @@ -1445,7 +1445,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm ) } /* - * verify that, in a preemtive callback mode client, a subscription callback never + * verify that, in a preemptive callback mode client, a subscription callback never * comes after the subscription is destroyed */ static void multiSubscrDestroyNoLateCallbackTest ( const char *pName, unsigned interestLevel ) @@ -1563,7 +1563,7 @@ void multiSubscriptionDeleteTest ( chid chan, unsigned interestLevel ) /* * singleSubscriptionDeleteTest * - * verify that we dont fail when we repeatedly create + * verify that we don't fail when we repeatedly create * and delete only one subscription with a high level of * traffic on it */ @@ -1617,7 +1617,7 @@ void singleSubscriptionDeleteTest ( chid chan, unsigned interestLevel ) /* * channelClearWithEventTrafficTest * - * verify that we can delete a channel that has subcriptions + * verify that we can delete a channel that has subscriptions * attached with heavy update traffic */ void channelClearWithEventTrafficTest ( const char *pName, unsigned interestLevel ) @@ -2481,7 +2481,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel ) showProgress ( interestLevel ); /* - * attempt to uncover problems where the last event isnt sent + * attempt to uncover problems where the last event isn't sent * and hopefully get into a flow control situation */ prevPassCount = 0u; @@ -2522,7 +2522,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel ) ca_poll (); /* emulate typical GUI */ for ( j = 0; j < NELEMENTS ( test ); j++ ) { /* - * we shouldnt see old monitors because + * we shouldn't see old monitors because * we resubscribed */ verify ( test[j].count <= i + 2 ); @@ -3016,7 +3016,7 @@ void testMultithreadSubscr ( void * pParm ) } /* - * test installation of subscriptions similar to usage paterns + * test installation of subscriptions similar to usage patterns * employed by modern versions of the sequencer */ void verifyMultithreadSubscr ( const char * pName, unsigned interestLevel ) @@ -3111,7 +3111,7 @@ void fdManagerVerify ( const char * pName, unsigned interestLevel ) status = ca_flush_io (); verify ( status == ECA_NORMAL ); - /* look for infinite loop in fd manager schedualing */ + /* look for infinite loop in fd manager scheduling */ epicsTimeGetCurrent ( & begin ); eventCount = 0u; while ( 1 ) { @@ -3175,7 +3175,7 @@ void verifyConnectWithDisconnectedChannels ( * we should be able to connect to a valid * channel within a reasonable delay even * though there is one permanently - * diasconnected channel + * disconnected channel */ status = ca_pend_io ( timeoutToPendIO ); verify ( status == ECA_NORMAL ); @@ -3491,7 +3491,7 @@ int acctst ( const char * pName, unsigned interestLevel, unsigned channelCount, /* * CA pend event delay accuracy test - * (CA asssumes that search requests can be sent + * (CA assumes that search requests can be sent * at least every 25 mS on all supported os) */ printf ( "\n" ); diff --git a/modules/ca/src/client/bhe.cpp b/modules/ca/src/client/bhe.cpp index d7fb77785..3808f061c 100644 --- a/modules/ca/src/client/bhe.cpp +++ b/modules/ca/src/client/bhe.cpp @@ -130,8 +130,8 @@ bool bhe::updatePeriod ( guard.assertIdenticalMutex ( this->mutex ); // - // this block is enetered if the beacon was created as a side effect of - // creating a connection and so we dont yet know the first beacon time + // this block is entered if the beacon was created as a side effect of + // creating a connection and so we don't yet know the first beacon time // and sequence number // if ( this->timeStamp == epicsTime () ) { @@ -154,7 +154,7 @@ bool bhe::updatePeriod ( return false; } - // 1) detect beacon duplications due to redundant routes + // 1) detect beacon duplication due to redundant routes // 2) detect lost beacons due to input queue overrun or damage if ( CA_V410 ( protocolRevision ) ) { unsigned beaconSeqAdvance; @@ -175,7 +175,7 @@ bool bhe::updatePeriod ( // throw out sequence numbers that jump forward by only a few numbers // (this situation is probably caused by a duplicate route - // or a beacon due to input queue overun) + // or a beacon due to input queue overrun) if ( beaconSeqAdvance > 1 && beaconSeqAdvance < 4 ) { logBeaconDiscard ( beaconSeqAdvance, currentTime ); return false; @@ -244,8 +244,8 @@ bool bhe::updatePeriod ( /* * Is this an IOC seen because of an IOC reboot * (beacon come at a higher rate just after the - * IOC reboots). Lower tolarance here because we - * dont have to worry about lost beacons. + * IOC reboots). Lower tolerance here because we + * don't have to worry about lost beacons. * * It may be possible to get false triggers here * if the client is busy, but this does not cause diff --git a/modules/ca/src/client/caProto.h b/modules/ca/src/client/caProto.h index c6e211c11..57b280177 100644 --- a/modules/ca/src/client/caProto.h +++ b/modules/ca/src/client/caProto.h @@ -58,8 +58,8 @@ #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) + * 1500 (max of Ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP) + * (the MTU of Ethernet is currently independent of its speed variant) */ #define ETHERNET_MAX_UDP ( 1500u - 20u - 8u ) #define MAX_UDP_RECV ( 0xffff + 16u ) /* allow large frames to be received in the future */ @@ -117,7 +117,7 @@ typedef ca_uint32_t caResId; /* * for use with search and not_found (if search fails and - * its not a broadcast tell the client to look elesewhere) + * its not a broadcast tell the client to look elsewhere) */ #define DOREPLY 10u #define DONTREPLY 5u @@ -176,7 +176,7 @@ typedef struct ca_hdr { struct mon_info { ca_float32_t m_lval; /* low delta */ ca_float32_t m_hval; /* high delta */ - ca_float32_t m_toval; /* period btween samples */ + ca_float32_t m_toval; /* period between samples */ ca_uint16_t m_mask; /* event select mask */ ca_uint16_t m_pad; /* extend to 32 bits */ }; diff --git a/modules/ca/src/client/ca_client_context.cpp b/modules/ca/src/client/ca_client_context.cpp index 1c2f985b5..671d1210b 100644 --- a/modules/ca/src/client/ca_client_context.cpp +++ b/modules/ca/src/client/ca_client_context.cpp @@ -224,7 +224,7 @@ void ca_client_context::changeExceptionEvent ( epicsGuard < epicsMutex > guard ( this->mutex ); this->ca_exception_func = pfunc; this->ca_exception_arg = arg; -// should block here until releated callback in progress completes +// should block here until related callback in progress completes } void ca_client_context::replaceErrLogHandler ( @@ -237,7 +237,7 @@ void ca_client_context::replaceErrLogHandler ( else { this->pVPrintfFunc = epicsVprintf; } -// should block here until releated callback in progress completes +// should block here until related callback in progress completes } void ca_client_context::registerForFileDescriptorCallBack ( @@ -252,7 +252,7 @@ void ca_client_context::registerForFileDescriptorCallBack ( // w/o having sent the wakeup message this->_sendWakeupMsg (); } -// should block here until releated callback in progress completes +// should block here until related callback in progress completes } int ca_client_context :: printFormated ( @@ -768,9 +768,9 @@ LIBCA_API int epicsStdCall ca_clear_subscription ( evid pMon ) // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( cac.cbMutex ); epicsGuard < epicsMutex > guard ( cac.mutex ); diff --git a/modules/ca/src/client/cac.cpp b/modules/ca/src/client/cac.cpp index b1abfc42a..f8d1d0800 100644 --- a/modules/ca/src/client/cac.cpp +++ b/modules/ca/src/client/cac.cpp @@ -285,7 +285,7 @@ cac::~cac () // this blocks until the UDP thread exits so that // it will not sneak in any new clients // - // lock intentionally not held here so that we dont deadlock + // lock intentionally not held here so that we don't deadlock // waiting for the UDP thread to exit while it is waiting to // get the lock. { @@ -312,7 +312,7 @@ cac::~cac () // // wait for all tcp threads to exit // - // this will block for oustanding sends to go out so dont + // this will block for outstanding sends to go out so don't // hold a lock while waiting // { @@ -411,7 +411,7 @@ void cac::show ( ::printf ( "Channel Access Client Context at %p for user %s\n", static_cast ( this ), this->pUserName ); - // this also supresses the "defined, but not used" + // this also suppresses the "defined, but not used" // warning message ::printf ( "\trevision \"%s\"\n", pVersionCAC ); diff --git a/modules/ca/src/client/cadef.h b/modules/ca/src/client/cadef.h index f64e3899c..fc94dfb6c 100644 --- a/modules/ca/src/client/cadef.h +++ b/modules/ca/src/client/cadef.h @@ -129,7 +129,7 @@ typedef unsigned CA_SYNC_GID; #define CA_OP_CONN_UP 6 #define CA_OP_CONN_DOWN 7 -/* depricated */ +/* deprecated */ #define CA_OP_SEARCH 2 /* @@ -464,7 +464,7 @@ LIBCA_API int epicsStdCall ca_array_get_callback /* Specify a function to be executed whenever significant changes */ /* occur to a channel. */ /* NOTES: */ -/* 1) Evid may be omited by passing a NULL pointer */ +/* 1) Evid may be omitted by passing a NULL pointer */ /* */ /* 2) An array count of zero specifies the native db count */ /* */ @@ -837,7 +837,7 @@ LIBCA_API double epicsStdCall ca_beacon_period (chid chan); LIBCA_API double epicsStdCall ca_receive_watchdog_delay (chid chan); /* - * used when an auxillary thread needs to join a CA client context started + * used when an auxiliary thread needs to join a CA client context started * by another thread */ LIBCA_API struct ca_client_context * epicsStdCall ca_current_context (); diff --git a/modules/ca/src/client/casw.cpp b/modules/ca/src/client/casw.cpp index 54a14036c..49c45ef3d 100644 --- a/modules/ca/src/client/casw.cpp +++ b/modules/ca/src/client/casw.cpp @@ -224,7 +224,7 @@ int main ( int argc, char ** argv ) * always set this field to INADDR_ANY * * clients always assume that if this - * field is set to something that isnt INADDR_ANY + * field is set to something that isn't INADDR_ANY * then it is the overriding IP address of the server. */ ina.sin_family = AF_INET; @@ -235,7 +235,7 @@ int main ( int argc, char ** argv ) } else { /* - * old servers dont supply this and the + * old servers don't supply this and the * default port must be assumed */ ina.sin_port = htons ( serverPort ); diff --git a/modules/ca/src/client/comBuf.cpp b/modules/ca/src/client/comBuf.cpp index 8f92170dd..5c9083ed7 100644 --- a/modules/ca/src/client/comBuf.cpp +++ b/modules/ca/src/client/comBuf.cpp @@ -45,7 +45,7 @@ bool comBuf::flushToWire ( wireSendAdapter & wire, const epicsTime & currentTime return true; } -// throwing the exception from a function that isnt inline +// throwing the exception from a function that isn't inline // shrinks the GNU compiled object code void comBuf::throwInsufficentBytesException () { diff --git a/modules/ca/src/client/comQueRecv.cpp b/modules/ca/src/client/comQueRecv.cpp index 026a84ced..60e142a35 100644 --- a/modules/ca/src/client/comQueRecv.cpp +++ b/modules/ca/src/client/comQueRecv.cpp @@ -196,7 +196,7 @@ epicsUInt16 comQueRecv::popUInt16 () if ( ! pComBuf ) { comBuf::throwInsufficentBytesException (); } - // try first for all in one buffer efficent version + // try first for all in one buffer efficient version epicsUInt16 tmp = 0; comBuf::popStatus status = pComBuf->pop ( tmp ); if ( status.success ) { @@ -215,7 +215,7 @@ epicsUInt32 comQueRecv::popUInt32 () if ( ! pComBuf ) { comBuf::throwInsufficentBytesException (); } - // try first for all in one buffer efficent version + // try first for all in one buffer efficient version epicsUInt32 tmp = 0; comBuf::popStatus status = pComBuf->pop ( tmp ); if ( status.success ) { @@ -230,7 +230,7 @@ epicsUInt32 comQueRecv::popUInt32 () bool comQueRecv::popOldMsgHeader ( caHdrLargeArray & msg ) { - // try first for all in one buffer efficent version + // try first for all in one buffer efficient version comBuf * pComBuf = this->bufs.first (); if ( ! pComBuf ) { return false; diff --git a/modules/ca/src/client/comQueSend.cpp b/modules/ca/src/client/comQueSend.cpp index e782a7017..c0c535f42 100644 --- a/modules/ca/src/client/comQueSend.cpp +++ b/modules/ca/src/client/comQueSend.cpp @@ -27,17 +27,17 @@ // 1) Allow sufficent headroom so that users will be able to perform // a reasonable amount of IO within CA callbacks without experiencing // a push/pull deadlock. If a potential push/pull deadlock situation -// occurs then detect and avoid it and provide diagnotic to the user +// occurs then detect and avoid it and provide diagnostic to the user // via special status. -// 2) Return status to the user when there is insufficent memory to +// 2) Return status to the user when there is insufficient memory to // queue a complete message. // 3) return status to the user when a message cant be flushed because // a connection dropped. -// 4) Do not allocate too much memory in exception situatons (such as +// 4) Do not allocate too much memory in exception situations (such as // after a circuit disconnect). // 5) Avoid allocating more memory than is absolutely necessary to meet // the above requirements. -// 6) Message fragments must never be sent to the IOC when there isnt +// 6) Message fragments must never be sent to the IOC when there isn't // enough memory to queue part of a message (we also must not force // a disconnect because the client is starved for memory). // 7) avoid the need to check status for each byte pushed into the @@ -45,7 +45,7 @@ // // Implementation: // 1) When queuing a complete message, first test to see if a flush is -// required. If it is a receive thread scheduals the flush with the +// required. If it is a receive thread schedules the flush with the // send thread, and otherwise directly execute the system call. The // send thread must run at a higher priority than the receive thread // if we are to minimize memory consumption. @@ -58,9 +58,9 @@ // a) A user is queuing more requests that demand a response from a // callback than are removed by the response that initiated the // callback, and this situation persists for many callbacks until -// all buffering in the system is exausted. +// all buffering in the system is exhausted. // b) A user is queuing many requests that demand a response from one -// callback until all buffering in the system is exausted. +// callback until all buffering in the system is exhausted. // c) Some combination of both (a) nad (b). // // diff --git a/modules/ca/src/client/convert.cpp b/modules/ca/src/client/convert.cpp index e043ee2fe..361b60222 100644 --- a/modules/ca/src/client/convert.cpp +++ b/modules/ca/src/client/convert.cpp @@ -35,7 +35,7 @@ #include "caerr.h" /* - * NOOP if this isnt required + * NOOP if this isn't required */ #ifdef EPICS_CONVERSION_REQUIRED @@ -326,7 +326,7 @@ arrayElementCount num /* number of values */ ** int encode; boolean, if true vax to ieee ** else ieee to vax ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1022,7 +1022,7 @@ arrayElementCount num /* number of values */ ** int encode; boolean, if true vax to ieee ** else ieee to vax ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1056,7 +1056,7 @@ arrayElementCount num /* number of values */ /**************************************************************************** ** cvrt_sts_long(s,d) ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1118,7 +1118,7 @@ arrayElementCount num /* number of values */ /**************************************************************************** ** cvrt_time_short(s,d) ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1239,7 +1239,7 @@ arrayElementCount num /* number of values */ /**************************************************************************** ** cvrt_sts_char(s,d) ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1274,7 +1274,7 @@ arrayElementCount num /* number of values */ /**************************************************************************** ** cvrt_time_long(s,d) ** -** converts fields ofstruct in HOST format to ieee format +** converts fields of struct in HOST format to ieee format ** or ** converts fields of struct in NET format to fields with HOST ** format @@ -1325,7 +1325,7 @@ arrayElementCount num /* number of values */ for(i=0; i guard ( this->mutex ); // a few legacy clients have a direct pointer to this buffer so we - // set the entrire string to nill terminators before we start copying + // set the entire string to nill terminators before we start copying // in the name (this reduces the chance that another thread will see // garbage characters). size_t newNameLen = strlen ( pHostNameIn ); diff --git a/modules/ca/src/client/iocinf.cpp b/modules/ca/src/client/iocinf.cpp index 7a0853f00..b2c30f7f9 100644 --- a/modules/ca/src/client/iocinf.cpp +++ b/modules/ca/src/client/iocinf.cpp @@ -189,7 +189,7 @@ extern "C" void epicsStdCall configureChannelAccessAddressList int yes; /* - * dont load the list twice + * don't load the list twice */ assert ( ellCount (pList) == 0 ); diff --git a/modules/ca/src/client/iocinf.h b/modules/ca/src/client/iocinf.h index ae775241d..0dadf44b0 100644 --- a/modules/ca/src/client/iocinf.h +++ b/modules/ca/src/client/iocinf.h @@ -56,7 +56,7 @@ static const double CA_CONN_VERIFY_PERIOD = 30.0; /* (sec) how often to request * monitor flow control * * turning this down effects maximum throughput - * because we dont get an optimal number of bytes + * because we don't get an optimal number of bytes * per network frame */ static const unsigned contiguousMsgCountWhichTriggersFlowControl = 10u; diff --git a/modules/ca/src/client/msgForMultiplyDefinedPV.cpp b/modules/ca/src/client/msgForMultiplyDefinedPV.cpp index f65b392ef..63c00d108 100644 --- a/modules/ca/src/client/msgForMultiplyDefinedPV.cpp +++ b/modules/ca/src/client/msgForMultiplyDefinedPV.cpp @@ -57,7 +57,7 @@ void msgForMultiplyDefinedPV::transactionComplete ( const char * pHostNameRej ) // calls into cac for the notification // the msg object (= this) is being deleted as part of the notification this->cb.pvMultiplyDefinedNotify ( *this, this->channel, this->acc, pHostNameRej ); - // !! dont touch 'this' pointer after this point because object has been deleted !! + // !! don't touch 'this' pointer after this point because object has been deleted !! } void * msgForMultiplyDefinedPV::operator new ( size_t size, diff --git a/modules/ca/src/client/nciu.cpp b/modules/ca/src/client/nciu.cpp index 61ccebafc..a862cb228 100644 --- a/modules/ca/src/client/nciu.cpp +++ b/modules/ca/src/client/nciu.cpp @@ -147,14 +147,14 @@ void nciu::connect ( unsigned nativeType, guard, this->accessRightState ); } - // channel uninstal routine grabs the callback lock so + // channel uninstall routine grabs the callback lock so // a channel will not be deleted while a call back is // in progress // // the callback lock is also taken when a channel // disconnects to prevent a race condition with the // code below - ie we hold the callback lock here - // so a chanel cant be destroyed out from under us. + // so a channel cant be destroyed out from under us. this->notify().connectNotify ( guard ); } diff --git a/modules/ca/src/client/netIO.h b/modules/ca/src/client/netIO.h index 2560663ba..e5b5814bc 100644 --- a/modules/ca/src/client/netIO.h +++ b/modules/ca/src/client/netIO.h @@ -32,7 +32,7 @@ // destructor is virtual (therefore it is protected). // I assume that SUNPRO will fix this in future versions. // With other compilers we get warnings (and -// potential problems) if we dont make the baseNMIU +// potential problems) if we don't make the baseNMIU // destructor virtual. #if defined ( __SUNPRO_CC ) && ( __SUNPRO_CC <= 0x540 ) # define NETIO_VIRTUAL_DESTRUCTOR diff --git a/modules/ca/src/client/oldAccess.h b/modules/ca/src/client/oldAccess.h index cace26ec1..2c39d2768 100644 --- a/modules/ca/src/client/oldAccess.h +++ b/modules/ca/src/client/oldAccess.h @@ -591,16 +591,16 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO ( io.destroy ( *this->pCallbackGuard.get(), guard ); } else { - // dont reverse the lock hierarchy + // don't reverse the lock hierarchy epicsGuardRelease < epicsMutex > guardRelease ( guard ); { // // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( this->cbMutex ); epicsGuard < epicsMutex > guard ( this->mutex ); diff --git a/modules/ca/src/client/oldChannelNotify.cpp b/modules/ca/src/client/oldChannelNotify.cpp index 0716a430b..71688c94c 100644 --- a/modules/ca/src/client/oldChannelNotify.cpp +++ b/modules/ca/src/client/oldChannelNotify.cpp @@ -571,7 +571,7 @@ int epicsStdCall ca_create_subscription ( oldSubscription ( guard, *pChan, pChan->io, tmpType, count, mask, pCallBack, pCallBackArg, monixptr ); - // dont touch object created after above new because + // don't touch object created after above new because // the first callback might have canceled, and therefore // destroyed, it return ECA_NORMAL; diff --git a/modules/ca/src/client/oldSubscription.cpp b/modules/ca/src/client/oldSubscription.cpp index b1290b2b8..72a51d9ad 100644 --- a/modules/ca/src/client/oldSubscription.cpp +++ b/modules/ca/src/client/oldSubscription.cpp @@ -41,7 +41,7 @@ oldSubscription::oldSubscription ( *pEventId = this; } io.subscribe ( guard, type, nElem, mask, *this, &this->id ); - // Dont touch this pointer after this point because the + // Don't touch this pointer after this point because the // 1st update callback might cancel the subscription and // thereby destroy this object. } diff --git a/modules/ca/src/client/repeater.cpp b/modules/ca/src/client/repeater.cpp index e597d66f6..e198a25d4 100644 --- a/modules/ca/src/client/repeater.cpp +++ b/modules/ca/src/client/repeater.cpp @@ -79,7 +79,7 @@ /* * these can be external since there is only one instance - * per machine so we dont care about reentrancy + * per machine so we don't care about reentrancy */ static tsDLList < repeaterClient > client_list; @@ -335,7 +335,7 @@ static void fanOut ( const osiSockAddr & from, const void * pMsg, while ( ( pclient = client_list.get () ) ) { theClients.add ( *pclient ); - /* Dont reflect back to sender */ + /* Don't reflect back to sender */ if ( pclient->identicalAddress ( from ) ) { continue; } @@ -392,7 +392,7 @@ static void register_new_client ( osiSockAddr & from, * repeater would not always allow the loopback address * as a local client address so current clients alternate * between the address of the first non-loopback interface - * found and the loopback addresss when subscribing with + * found and the loopback address when subscribing with * the CA repeater until all CA repeaters have been updated * to current code. */ @@ -452,7 +452,7 @@ static void register_new_client ( osiSockAddr & from, } /* - * send a noop message to all other clients so that we dont + * send a noop message to all other clients so that we don't * accumulate sockets when there are no beacons */ caHdr noop; diff --git a/modules/ca/src/client/searchTimer.cpp b/modules/ca/src/client/searchTimer.cpp index 5a4fa446a..affa352b7 100644 --- a/modules/ca/src/client/searchTimer.cpp +++ b/modules/ca/src/client/searchTimer.cpp @@ -317,7 +317,7 @@ void searchTimer :: show ( unsigned level ) const // // Reset the delay to the next search request if we get -// at least one response. However, dont reset this delay if we +// at least one response. However, don't reset this delay if we // get a delayed response to an old search request. // void searchTimer::uninstallChanDueToSuccessfulSearchResponse ( diff --git a/modules/ca/src/client/searchTimer.h b/modules/ca/src/client/searchTimer.h index 74c8bde6e..ca5d2c55d 100644 --- a/modules/ca/src/client/searchTimer.h +++ b/modules/ca/src/client/searchTimer.h @@ -82,8 +82,8 @@ private: double framesPerTry; /* # of UDP frames per search try */ double framesPerTryCongestThresh; /* one half N tries w congest */ unsigned retry; - unsigned searchAttempts; /* num search tries after last timer experation */ - unsigned searchResponses; /* num search resp after last timer experation */ + unsigned searchAttempts; /* num search tries after last timer expiration */ + unsigned searchResponses; /* num search resp after last timer expiration */ const unsigned index; ca_uint32_t dgSeqNoAtTimerExpireBegin; ca_uint32_t dgSeqNoAtTimerExpireEnd; diff --git a/modules/ca/src/client/syncgrp.cpp b/modules/ca/src/client/syncgrp.cpp index bee6ea8dc..4f79348fd 100644 --- a/modules/ca/src/client/syncgrp.cpp +++ b/modules/ca/src/client/syncgrp.cpp @@ -82,9 +82,9 @@ extern "C" int epicsStdCall ca_sg_delete ( const CA_SYNC_GID gid ) // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( pcac->cbMutex ); epicsGuard < epicsMutex > guard ( pcac->mutex ); @@ -106,9 +106,9 @@ void sync_group_reset ( ca_client_context & client, CASG & sg ) // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( client.cbMutex ); epicsGuard < epicsMutex > guard ( client.mutex ); @@ -219,9 +219,9 @@ extern "C" int epicsStdCall ca_sg_test ( const CA_SYNC_GID gid ) // we will definately stall out here if all of the // following are true // - // o user creates non-preemtive mode client library context + // o user creates non-preemptive mode client library context // o user doesnt periodically call a ca function - // o user calls this function from an auxiillary thread + // o user calls this function from an auxiliary thread // CallbackGuard cbGuard ( pcac->cbMutex ); epicsGuard < epicsMutex > guard ( pcac->mutex ); diff --git a/modules/ca/src/client/tcpRecvWatchdog.cpp b/modules/ca/src/client/tcpRecvWatchdog.cpp index 9e0bf0188..367e09237 100644 --- a/modules/ca/src/client/tcpRecvWatchdog.cpp +++ b/modules/ca/src/client/tcpRecvWatchdog.cpp @@ -176,7 +176,7 @@ void tcpRecvWatchdog::sendBacklogProgressNotify ( { guard.assertIdenticalMutex ( this->mutex ); - // We dont set "beaconAnomaly" to be false here because, after we see a + // We don't set "beaconAnomaly" to be false here because, after we see a // beacon anomaly (which could be transiently detecting a reboot) we will // not trust the beacon as an indicator of a healthy server until we // receive at least one message from the server. diff --git a/modules/ca/src/client/tcpiiu.cpp b/modules/ca/src/client/tcpiiu.cpp index e601c8d24..a8b04a2f7 100644 --- a/modules/ca/src/client/tcpiiu.cpp +++ b/modules/ca/src/client/tcpiiu.cpp @@ -81,7 +81,7 @@ void tcpSendThread::run () while ( true ) { - // dont wait if there is still labor to be done below + // don't wait if there is still labor to be done below if ( ! laborPending ) { epicsGuardRelease < epicsMutex > unguard ( guard ); this->iiu.sendThreadFlushEvent.wait (); @@ -124,7 +124,7 @@ void tcpSendThread::run () } else { // This wakes up the resp thread so that it can call - // the connect callback. This isnt maximally efficent + // the connect callback. This isn't maximally efficient // but it has the excellent side effect of not requiring // that the UDP thread take the callback lock. There are // almost no V42 servers left at this point. @@ -204,7 +204,7 @@ void tcpSendThread::run () while ( ! this->iiu.recvThread.exitWait ( 30.0 ) ) { // it is possible to get stuck here if the user calls - // ca_context_destroy() when a circuit isnt known to + // ca_context_destroy() when a circuit isn't known to // be unresponsive, but is. That situation is probably // rare, and the IP kernel might have a timeout for // such situations, nevertheless we will attempt to deal @@ -322,7 +322,7 @@ void tcpiiu::recvBytes ( return; } - // if the circuit was locally aborted then supress + // if the circuit was locally aborted then suppress // warning messages about bad file descriptor etc if ( this->state != iiucs_connected && this->state != iiucs_clean_shutdown ) { @@ -358,9 +358,9 @@ void tcpiiu::recvBytes ( epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - // the replacable printf handler isnt called here - // because it reqires a callback lock which probably - // isnt appropriate here + // the replaceable printf handler isn't called here + // because it requires a callback lock which probably + // isn't appropriate here char name[64]; this->hostNameCacheInstance.getName ( name, sizeof ( name ) ); @@ -535,11 +535,11 @@ void tcpRecvThread::run () } // - // we dont feel comfortable calling this with a lock applied + // we don't feel comfortable calling this with a lock applied // (it might block for longer than we like) // - // we would prefer to improve efficency by trying, first, a - // recv with the new MSG_DONTWAIT flag set, but there isnt + // we would prefer to improve efficiency by trying, first, a + // recv with the new MSG_DONTWAIT flag set, but there isn't // universal support // bool bytesArePending = this->iiu.bytesArePendingInOS (); @@ -1002,7 +1002,7 @@ void tcpiiu::initiateAbortShutdown ( }; // - // wake up the send thread if it isnt blocking in send() + // wake up the send thread if it isn't blocking in send() // this->sendThreadFlushEvent.signal (); this->flushBlockEvent.signal (); @@ -1580,7 +1580,7 @@ void tcpiiu::subscriptionRequest ( maxBytes = MAX_TCP; } unsigned dataType = subscr.getType ( guard ); - // data type bounds checked when sunscription created + // data type bounds checked when subscription created arrayElementCount maxElem = ( maxBytes - dbr_size[dataType] ) / dbr_value_size[dataType]; if ( nElem > maxElem ) { throw cacChannel::msgBodyCacheTooSmall (); @@ -1633,7 +1633,7 @@ void tcpiiu::subscriptionUpdateRequest ( throw cacChannel::msgBodyCacheTooSmall (); } comQueSendMsgMinder minder ( this->sendQue, guard ); - // nElem boounds checked above + // nElem bounds checked above this->sendQue.insertRequestHeader ( CA_PROTO_READ_NOTIFY, 0u, static_cast < ca_uint16_t > ( dataType ), @@ -1712,7 +1712,7 @@ void tcpiiu :: flush ( epicsGuard < epicsMutex > & guard ) this->flushRequest ( guard ); // the process thread is not permitted to flush as this // can result in a push / pull deadlock on the TCP pipe. - // Instead, the process thread scheduals the flush with the + // Instead, the process thread schedules the flush with the // send thread which runs at a higher priority than the // receive thread. The same applies to the UDP thread for // locking hierarchy reasons. @@ -1817,7 +1817,7 @@ void tcpiiu::disconnectAllChannels ( } while ( nciu * pChan = this->createRespPend.get () ) { - // we dont yet know the server's id so we cant + // we don't yet know the server's id so we cant // send a channel delete request and will instead // trust that the server can do the proper cleanup // when the circuit disconnects @@ -1848,7 +1848,7 @@ void tcpiiu::disconnectAllChannels ( while ( nciu * pChan = this->unrespCircuit.get () ) { // if we know that the circuit is unresponsive - // then we dont send a channel delete request and + // then we don't send a channel delete request and // will instead trust that the server can do the // proper cleanup when the circuit disconnects pChan->disconnectAllIO ( cbGuard, guard ); @@ -1883,7 +1883,7 @@ void tcpiiu::unlinkAllChannels ( while ( nciu * pChan = this->createRespPend.get () ) { pChan->channelNode::listMember = channelNode::cs_none; - // we dont yet know the server's id so we cant + // we don't yet know the server's id so we cant // send a channel delete request and will instead // trust that the server can do the proper cleanup // when the circuit disconnects @@ -1921,7 +1921,7 @@ void tcpiiu::unlinkAllChannels ( channelNode::cs_none; pChan->disconnectAllIO ( cbGuard, guard ); // if we know that the circuit is unresponsive - // then we dont send a channel delete request and + // then we don't send a channel delete request and // will instead trust that the server can do the // proper cleanup when the circuit disconnects pChan->serviceShutdownNotify ( cbGuard, guard ); @@ -1951,7 +1951,7 @@ void tcpiiu::installChannel ( this->channelCountTot++; chan.channelNode::listMember = channelNode::cs_createReqPend; chan.searchReplySetUp ( *this, sidIn, typeIn, countIn, guard ); - // The tcp send thread runs at apriority below the udp thread + // The tcp send thread runs at a priority below the udp thread // so that this will not send small packets this->sendThreadFlushEvent.signal (); } @@ -2060,7 +2060,7 @@ bool tcpiiu::bytesArePendingInOS () const } return false; #else - osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */ + osiSockIoctl_t bytesPending = 0; /* shut up Purify's yapping */ int status = socket_ioctl ( this->sock, FIONREAD, & bytesPending ); if ( status >= 0 ) { diff --git a/modules/ca/src/client/test/ca_test.c b/modules/ca/src/client/test/ca_test.c index 0d1ec2f57..adae20b84 100644 --- a/modules/ca/src/client/test/ca_test.c +++ b/modules/ca/src/client/test/ca_test.c @@ -279,7 +279,7 @@ skip_rest: /* * wait for the operation to complete - * (outstabnding decrements to zero) + * (outstanding decrements to zero) */ while(ntries){ ca_pend_event(1.0); diff --git a/modules/ca/src/client/udpiiu.cpp b/modules/ca/src/client/udpiiu.cpp index 723117a71..1b299278c 100644 --- a/modules/ca/src/client/udpiiu.cpp +++ b/modules/ca/src/client/udpiiu.cpp @@ -536,9 +536,9 @@ void epicsStdCall caRepeaterRegistrationMessage ( if ( status < 0 ) { int errnoCpy = SOCKERRNO; /* - * Different OS return different codes when the repeater isnt running. - * Its ok to supress these messages because I print another warning message - * if we time out registerring with the repeater. + * Different OS return different codes when the repeater isn't running. + * Its ok to suppress these messages because I print another warning message + * if we time out registering with the repeater. * * Linux returns SOCK_ECONNREFUSED * Windows 2000 returns SOCK_ECONNRESET @@ -673,7 +673,7 @@ bool udpiiu :: searchRespAction ( const epicsTime & currentTime ) { /* - * we dont currently know what to do with channel's + * we don't currently know what to do with channel's * found to be at non-IP type addresses */ if ( addr.sa.sa_family != AF_INET ) { @@ -762,7 +762,7 @@ bool udpiiu::beaconAction ( * always set this field to INADDR_ANY * * clients always assume that if this - * field is set to something that isnt INADDR_ANY + * field is set to something that isn't INADDR_ANY * then it is the overriding IP address of the server. */ ina.sin_family = AF_INET; @@ -772,7 +772,7 @@ bool udpiiu::beaconAction ( } else { /* - * old servers dont supply this and the + * old servers don't supply this and the * default port must be assumed */ ina.sin_port = htons ( this->serverPort ); @@ -874,7 +874,7 @@ void udpiiu::postMsg ( size = pCurMsg->m_postsize + sizeof ( *pCurMsg ); /* - * dont allow msg body extending beyond frame boundary + * don't allow msg body extending beyond frame boundary */ if ( size > blockSize ) { char buf[64]; @@ -1044,7 +1044,7 @@ void udpiiu :: SearchRespCallback :: notify ( const osiSockAddr & addr, const epicsTime & currentTime ) { /* - * we dont currently know what to do with channel's + * we don't currently know what to do with channel's * found to be at non-IP type addresses */ if ( addr.sa.sa_family != AF_INET ) { @@ -1119,7 +1119,7 @@ bool udpiiu :: datagramFlush ( { guard.assertIdenticalMutex ( cacMutex ); - // dont send the version header by itself + // don't send the version header by itself if ( this->nBytesInXmitBuf <= sizeof ( caHdr ) ) { return false; } diff --git a/modules/ca/src/tools/caget.c b/modules/ca/src/tools/caget.c index 0aa655ee5..e60f61922 100644 --- a/modules/ca/src/tools/caget.c +++ b/modules/ca/src/tools/caget.c @@ -256,7 +256,7 @@ static int caget (pv *pvs, int nPvs, RequestT request, OutputT format, for (n = 0; n < nPvs; n++) { switch (format) { - case plain: /* Emulate old caget behaviour */ + case plain: /* Emulate old caget behavior */ if (pvs[n].nElems <= 1 && fieldSeparator == ' ') printf("%-30s", pvs[n].name); else printf("%s", pvs[n].name); printf("%c", fieldSeparator); diff --git a/modules/ca/src/tools/caput.c b/modules/ca/src/tools/caput.c index 62def624e..05247643a 100644 --- a/modules/ca/src/tools/caput.c +++ b/modules/ca/src/tools/caput.c @@ -192,7 +192,7 @@ int caget (pv *pvs, int nPvs, OutputT format, for (n = 0; n < nPvs; n++) { switch (format) { - case plain: /* Emulate old caput behaviour */ + case plain: /* Emulate old caput behavior */ if (pvs[n].reqElems <= 1 && fieldSeparator == ' ') printf("%-30s", pvs[n].name); else printf("%s", pvs[n].name); printf("%c", fieldSeparator); diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c index 8aac52f00..f395e2fb9 100644 --- a/modules/database/src/ioc/db/dbAccess.c +++ b/modules/database/src/ioc/db/dbAccess.c @@ -529,7 +529,7 @@ long dbProcess(dbCommon *precord) } } - /* If already active dont process */ + /* If already active don't process */ if (precord->pact) { unsigned short monitor_mask; @@ -931,7 +931,7 @@ long dbGet(DBADDR *paddr, short dbrType, no_elements = capacity = pfl->no_elements; } - /* Update field info from record (if neccessary); + /* Update field info from record (if necessary); * may modify paddr->pfield. */ if (!dbfl_has_copy(pfl) && diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h index 771084170..eef5e990b 100644 --- a/modules/database/src/ioc/db/dbAccessDefs.h +++ b/modules/database/src/ioc/db/dbAccessDefs.h @@ -73,7 +73,7 @@ DBCORE_API extern int dbAccessDebugPUTF; * options has a bit set for each option that was accepted * number_elements is actual number of elements obtained * - * The individual items can be refered to by the expressions:: + * The individual items can be referred to by the expressions:: * * buffer.status * buffer.severity diff --git a/modules/database/src/ioc/db/dbBkpt.c b/modules/database/src/ioc/db/dbBkpt.c index a32ebab4e..de6fa3f9b 100644 --- a/modules/database/src/ioc/db/dbBkpt.c +++ b/modules/database/src/ioc/db/dbBkpt.c @@ -97,7 +97,7 @@ static long FIND_CONT_NODE( * processing in that lockset to this task. The separate task is * used so that locksets that do not have breakpoints are isolated * from locksets that do. This allows the processing of other - * locksets to continue uninterupted, even if they exist on the same + * locksets to continue uninterrupted, even if they exist on the same * scan list as a lockset containing a breakpoint. * * An entrypoint is the first record that gets processed in a lockset. @@ -250,7 +250,7 @@ static long FIND_CONT_NODE( } /* - * Initialise the breakpoint stack + * Initialize the breakpoint stack */ void dbBkptInit(void) { diff --git a/modules/database/src/ioc/db/dbConstLink.c b/modules/database/src/ioc/db/dbConstLink.c index 282493992..03f64e289 100644 --- a/modules/database/src/ioc/db/dbConstLink.c +++ b/modules/database/src/ioc/db/dbConstLink.c @@ -63,7 +63,7 @@ cvt_st_ ## TYPE(const char *from, void *pfield, const dbAddr *paddr) { \ return epicsParse##TYPE(from, to, 0, &end); \ } -/* Instanciate for CHAR, UCHAR, SHORT, USHORT and LONG */ +/* Instantiate for CHAR, UCHAR, SHORT, USHORT and LONG */ cvt_st_int(Int8) cvt_st_int(UInt8) cvt_st_int(Int16) @@ -99,7 +99,7 @@ static long cvt_st_UInt32(const char *from, void *pfield, const dbAddr *paddr) return status; } -/* Instanciate for INT64 and UINT64 */ +/* Instantiate for INT64 and UINT64 */ cvt_st_int(Int64) cvt_st_int(UInt64) @@ -117,7 +117,7 @@ cvt_st_ ## TYPE(const char *from, void *pfield, const dbAddr *paddr) { \ return epicsParse##TYPE(from, to, &end); \ } -/* Instanciate for FLOAT32 and FLOAT64 */ +/* Instantiate for FLOAT32 and FLOAT64 */ cvt_st_float(Float32) cvt_st_float(Float64) diff --git a/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp b/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp index efcfa1d74..1c5e0d0f9 100644 --- a/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp +++ b/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp @@ -9,7 +9,7 @@ \*************************************************************************/ /* - * Auther Jeff Hill + * Author Jeff Hill */ #include diff --git a/modules/database/src/ioc/db/dbConvertJSON.h b/modules/database/src/ioc/db/dbConvertJSON.h index e01ad29aa..045bd937b 100644 --- a/modules/database/src/ioc/db/dbConvertJSON.h +++ b/modules/database/src/ioc/db/dbConvertJSON.h @@ -16,7 +16,7 @@ extern "C" { #endif -/* This name should probably be changed to inclue "array" */ +/* This name should probably be changed to include "array" */ DBCORE_API long dbPutConvertJSON(const char *json, short dbrType, void *pdest, long *psize); DBCORE_API long dbLSConvertJSON(const char *json, char *pdest, diff --git a/modules/database/src/ioc/db/dbEvent.c b/modules/database/src/ioc/db/dbEvent.c index b3c641798..85bba06cb 100644 --- a/modules/database/src/ioc/db/dbEvent.c +++ b/modules/database/src/ioc/db/dbEvent.c @@ -90,7 +90,7 @@ struct event_user { void *extralabor_arg;/* parameter to above */ epicsThreadId taskid; /* event handler task id */ - struct evSubscrip *pSuicideEvent; /* event that is deleteing itself */ + struct evSubscrip *pSuicideEvent; /* event that is deleting itself */ unsigned queovr; /* event que overflow count */ unsigned char pendexit; /* exit pend task */ unsigned char extra_labor; /* if set call extra labor func */ @@ -102,7 +102,7 @@ struct event_user { /* * Reliable intertask communication requires copying the current value of the - * channel for later queing so 3 stepper motor steps of 10 each do not turn + * channel for later queuing so 3 stepper motor steps of 10 each do not turn * into only 10 or 20 total steps part of the time. */ @@ -585,7 +585,7 @@ void db_cancel_event (dbEventSubscription event) /* * flag the event as canceled by NULLing out the callback handler * - * make certain that the event isnt being accessed while + * make certain that the event isn't being accessed while * its call back changes */ LOCKEVQUE (pevent->ev_que); @@ -811,7 +811,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) pevent->nreplace++; /* * the event task has already been notified about - * this so we dont need to post the semaphore + * this so we don't need to post the semaphore */ firstEventFlag = 0; } @@ -844,7 +844,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) UNLOCKEVQUE (ev_que); /* - * its more efficent to notify the event handler + * its more efficient to notify the event handler * only after the event is ready and the lock * is off in case it runs at a higher priority * than the caller here. @@ -974,7 +974,7 @@ static int event_read ( struct event_que *ev_que ) * Next event pointer can be used by event tasks to determine * if more events are waiting in the queue * - * Must remove the lock here so that we dont deadlock if + * Must remove the lock here so that we don't deadlock if * this calls dbGetField() and blocks on the record lock, * dbPutField() is in progress in another task, it has the * record lock, and it is calling db_post_events() waiting diff --git a/modules/database/src/ioc/db/dbNotify.h b/modules/database/src/ioc/db/dbNotify.h index 3262009c9..98408bf7e 100644 --- a/modules/database/src/ioc/db/dbNotify.h +++ b/modules/database/src/ioc/db/dbNotify.h @@ -130,7 +130,7 @@ DBCORE_API int dbNotifyDump(void); * if a process request is issued and also calls the client callbacks. * * A process request is issued if any of the following is true. - * 1) The requester has issued a processs request and record is passive. + * 1) The requester has issued a process request and record is passive. * 2) The requester is doing a put, the record is passive, and either * a) The field description is process passive. * b) The field is PROC. @@ -156,7 +156,7 @@ DBCORE_API int dbNotifyDump(void); * As soon as a record completes processing the field is set NULL * ppnr pointer to processNotifyRecord, which is a private structure * owned by dbNotify. - * dbNotify is reponsible for this structure. + * dbNotify is responsible for this structure. * */ #ifdef __cplusplus diff --git a/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp b/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp index 394b50c50..fe42d094c 100644 --- a/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp +++ b/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp @@ -110,7 +110,7 @@ extern "C" void putNotifyCompletion ( processNotify *ppn ) if ( pNtfy ) { pBlocker->pNotify = 0; // Its necessary to signal the initiators now before we call - // the user callback. This is less efficent, and potentially + // the user callback. This is less efficient, and potentially // causes more thread context switching, but its probably // unavoidable because its possible that the use callback // might destroy this object. diff --git a/modules/database/src/ioc/db/dbTest.c b/modules/database/src/ioc/db/dbTest.c index 6f5c3eab2..029077c07 100644 --- a/modules/database/src/ioc/db/dbTest.c +++ b/modules/database/src/ioc/db/dbTest.c @@ -1300,7 +1300,7 @@ static void dbpr_insert_msg(TAB_BUFFER *pMsgBuff,size_t len,int tab_size) current_len = strlen(pMsgBuff->out_buff); tot_line = current_len + len; - /* flush buffer if overflow would occor */ + /* flush buffer if overflow would occur */ if (tot_line > MAXLINE) dbpr_msg_flush(pMsgBuff, tab_size); diff --git a/modules/database/src/ioc/db/dbUnitTest.h b/modules/database/src/ioc/db/dbUnitTest.h index 57ccd0259..60d4e7883 100644 --- a/modules/database/src/ioc/db/dbUnitTest.h +++ b/modules/database/src/ioc/db/dbUnitTest.h @@ -7,7 +7,7 @@ \*************************************************************************/ /** @file dbUnitTest.h - * @brief Helpers for unitests of process database + * @brief Helpers for unittests of process database * @author Michael Davidsaver, Ralph Lange * * @see @ref dbunittest @@ -149,7 +149,7 @@ DBCORE_API void testMonitorDestroy(testMonitor*); */ DBCORE_API void testMonitorWait(testMonitor*); /** Return the number of monitor events which have occured since create, - * or a pervious reset (called reset=1). + * or a previous reset (called reset=1). * Calling w/ reset=0 only returns the count. * Calling w/ reset=1 resets the count to zero and ensures that the next * wait will block unless subsequent events occur. Returns the previous diff --git a/modules/database/src/ioc/db/db_access_routines.h b/modules/database/src/ioc/db/db_access_routines.h index cd8b09c40..ee2f07940 100644 --- a/modules/database/src/ioc/db/db_access_routines.h +++ b/modules/database/src/ioc/db/db_access_routines.h @@ -27,7 +27,7 @@ DBCORE_API extern volatile int interruptAccept; /* - * Adaptors for db_access users + * Adapters for db_access users */ DBCORE_API struct dbChannel * dbChannel_create(const char *pname); DBCORE_API int dbChannel_get(struct dbChannel *chan, diff --git a/modules/database/src/ioc/dbStatic/dbStaticLib.c b/modules/database/src/ioc/dbStatic/dbStaticLib.c index 35433d9cd..3ed08de72 100644 --- a/modules/database/src/ioc/dbStatic/dbStaticLib.c +++ b/modules/database/src/ioc/dbStatic/dbStaticLib.c @@ -677,7 +677,7 @@ long dbAddPath(DBBASE *pdbbase,const char *path) if (!path) return(0); /* Empty path strings are ignored */ /* care is taken to properly deal with white space * 1) preceding and trailing white space is removed from paths - * 2) white space inbetween path separator counts as an empty name + * 2) white space in between path separator counts as an empty name * (see below) */ expectingPath = FALSE; @@ -710,8 +710,8 @@ long dbAddPath(DBBASE *pdbbase,const char *path) /* * len is always nonzero because we found something that - * 1) isnt white space - * 2) isnt a path separator + * 1) isn't white space + * 2) isn't a path separator */ len = (plast - path) + 1; if (dbAddOnePath (pdbbase, path, (unsigned) len)) return (-1); @@ -722,7 +722,7 @@ long dbAddPath(DBBASE *pdbbase,const char *path) } /* - * an empty name at beginning, middle, or end of a path string that isnt + * an empty name at beginning, middle, or end of a path string that isn't * empty means current directory */ if (expectingPath||sawMissingPath) { @@ -2274,7 +2274,7 @@ long dbParseLink(const char *str, short ftype, dbLinkInfo *pinfo) len -= (parm - pstr); } - /* generalized extraction of ID charactor and integer pairs (eg. "#C15 S14") */ + /* generalized extraction of ID character and integer pairs (eg. "#C15 S14") */ ret = sscanf(pinfo->target, "# %c%d %c%d %c%d %c%d %c%d %c", &pinfo->hwid[0], &pinfo->hwnums[0], &pinfo->hwid[1], &pinfo->hwnums[1], @@ -2333,11 +2333,11 @@ long dbParseLink(const char *str, short ftype, dbLinkInfo *pinfo) } pinfo->ltype = PV_LINK; - pstr = strchr(pstr, ' '); /* find start of link modifiers (can't be seperated by tabs) */ + pstr = strchr(pstr, ' '); /* find start of link modifiers (can't be separated by tabs) */ if (pstr) { *pstr++ = '\0'; /* isolate modifiers. pinfo->target is PV name only for re-use in struct pv_link */ - /* Space seperation of modifiers isn't required, and other chars are ignored. + /* Space separation of modifiers isn't required, and other chars are ignored. * Order of comparisons resolves ambiguity by checking for * longer matches first. * eg. "QQCPPXMSITT" is pvlOptCPP|pvlOptMSI diff --git a/modules/database/src/ioc/dbStatic/devSup.h b/modules/database/src/ioc/dbStatic/devSup.h index c41b834ea..799569927 100644 --- a/modules/database/src/ioc/dbStatic/devSup.h +++ b/modules/database/src/ioc/dbStatic/devSup.h @@ -77,7 +77,7 @@ typedef struct typed_dset { long (*init_record)(struct dbCommon *prec); /** Called when SCAN="I/O Intr" on startup, or after SCAN is changed. * - * Caller must assign the third arguement (IOCSCANPVT*). eg. + * Caller must assign the third argument (IOCSCANPVT*). eg. @code struct mpvt { IOSCANPVT drvlist; @@ -173,7 +173,7 @@ DBCORE_API void dbInitDevSup(struct devSup *pdevSup, dset *pdset); #define S_dev_badOutType (M_devSup| 9) /*Bad OUT link type*/ #define S_dev_badInitRet (M_devSup|11) /*Bad init_rec return value */ #define S_dev_badBus (M_devSup|13) /*Illegal bus type*/ -#define S_dev_badCard (M_devSup|15) /*Illegal or nonexistant module*/ +#define S_dev_badCard (M_devSup|15) /*Illegal or nonexistent module*/ #define S_dev_badSignal (M_devSup|17) /*Illegal signal*/ #define S_dev_NoInit (M_devSup|19) /*No init*/ #define S_dev_Conflict (M_devSup|21) /*Multiple records accessing same signal*/ diff --git a/modules/database/src/ioc/dbStatic/link.h b/modules/database/src/ioc/dbStatic/link.h index c5481fd74..74607a1b1 100644 --- a/modules/database/src/ioc/dbStatic/link.h +++ b/modules/database/src/ioc/dbStatic/link.h @@ -180,7 +180,7 @@ union value { struct vmeio vmeio; /* vme io point */ struct camacio camacio; /* camac io point */ struct rfio rfio; /* CEBAF RF buffer interface */ - struct abio abio; /* allen-bradley io point */ + struct abio abio; /* Allen-Bradley io point */ struct gpibio gpibio; struct bitbusio bitbusio; struct instio instio; /* instrument io link */ diff --git a/modules/database/src/ioc/dbStatic/special.h b/modules/database/src/ioc/dbStatic/special.h index 575294f3c..f340ca757 100644 --- a/modules/database/src/ioc/dbStatic/special.h +++ b/modules/database/src/ioc/dbStatic/special.h @@ -21,14 +21,14 @@ extern "C" { #endif -/*NOTE Do NOT add aditional definitions with out modifying dbLexRoutines.c */ +/*NOTE Do NOT add additional definitions with out modifying dbLexRoutines.c */ /* types 1-99 are global. Record specific must start with 100 */ #define SPC_NOMOD 1 /*Field must not be modified*/ #define SPC_DBADDR 2 /*db_name_to_addr must call cvt_dbaddr*/ #define SPC_SCAN 3 /*A scan related field is being changed*/ #define SPC_ALARMACK 5 /*Special Alarm Acknowledgement*/ #define SPC_AS 6 /* Access Security*/ -#define SPC_ATTRIBUTE 7 /* psuedo field, i.e. attribute field*/ +#define SPC_ATTRIBUTE 7 /* pseudo field, i.e. attribute field*/ /* useful when record support must be notified of a field changing value*/ #define SPC_MOD 100 /* used by all records that support a reset field*/ diff --git a/modules/database/src/ioc/dbtemplate/msi.cpp b/modules/database/src/ioc/dbtemplate/msi.cpp index 6445c22f1..d504e3ea4 100644 --- a/modules/database/src/ioc/dbtemplate/msi.cpp +++ b/modules/database/src/ioc/dbtemplate/msi.cpp @@ -317,7 +317,7 @@ static void makeSubstitutions(inputData * const inputPvt, pstart = ++p; /*Look for end quote*/ while (*p && (*p != '"')) { - /*allow escape for embeded quote*/ + /*allow escape for embedded quote*/ if ((p[0] == '\\') && p[1] == '"') { p += 2; continue; @@ -1028,7 +1028,7 @@ static tokenType subGetNextToken(subFile *psubFile) subFileErrPrint(psubFile, "Strings must be on single line\n"); abortExit(1); } - /*allow escape for embeded quote*/ + /*allow escape for embedded quote*/ if ((p[0] == '\\') && p[1] == '"') { *pto++ = *p++; *pto++ = *p++; diff --git a/modules/database/src/ioc/rsrv/camessage.c b/modules/database/src/ioc/rsrv/camessage.c index 21c835b8f..49b82ced7 100644 --- a/modules/database/src/ioc/rsrv/camessage.c +++ b/modules/database/src/ioc/rsrv/camessage.c @@ -97,7 +97,7 @@ typedef struct rsrv_put_notify { /* * casCalloc() * - * (dont drop below some max block threshold) + * (don't drop below some max block threshold) */ static void *casCalloc(size_t count, size_t size) { @@ -341,7 +341,7 @@ static int bad_tcp_cmd_action ( caHdrLargeArray *mp, void *pPayload, log_header ( pCtx, client, mp, pPayload, 0 ); /* - * by default, clients dont recover + * by default, clients don't recover * from this */ SEND_LOCK (client); @@ -503,7 +503,7 @@ static void read_reply ( void *pArg, struct dbChannel *dbch, cid = ECA_NORMAL; /* If the client has requested a zero element count we interpret this as a - * request for all avaiable elements. In this case we initialise the + * request for all available elements. In this case we initialize the * header with the maximum element size specified by the database. */ autosize = pevext->msg.m_count == 0; item_count = @@ -870,7 +870,7 @@ static int host_name_action ( caHdrLargeArray *mp, void *pPayload, } /* - * user name will not change if there isnt enough memory + * user name will not change if there isn't enough memory */ pMalloc = malloc(size); if(!pMalloc){ @@ -949,7 +949,7 @@ static int client_name_action ( caHdrLargeArray *mp, void *pPayload, } /* - * user name will not change if there isnt enough memory + * user name will not change if there isn't enough memory */ pMalloc = malloc(size); if(!pMalloc){ @@ -1016,7 +1016,7 @@ unsigned cid * NOTE: This detects the case where the PV id wraps * around and we attempt to have two resources on the same id. * The lock is applied here because on some architectures the - * ++ operator isnt atomic. + * ++ operator isn't atomic. */ LOCK_CLIENTQ; @@ -1436,7 +1436,7 @@ static void write_notify_reply ( struct client * pClient ) msgtmp.m_available, 0 ); if ( localStatus != ECA_NORMAL ) { /* - * inability to aquire buffer space + * inability to acquire buffer space * Indicates corruption */ errlogPrintf("CA server corrupted - put call back(s) discarded\n"); @@ -1570,7 +1570,7 @@ static int rsrvExpandPutNotify ( if ( sizeNeeded > pNotify->valueSize ) { /* - * try to use the union embeded in the free list + * try to use the union embedded in the free list * item, but allocate a random sized block if they * writing a vector. */ @@ -1625,7 +1625,7 @@ void rsrvFreePutNotify ( client *pClient, epicsMutexUnlock ( pClient->putNotifyLock ); /* - * if any possiblity that the put notify is + * if any possibility that the put notify is * outstanding then cancel it */ if ( busyTmp ) { @@ -1736,7 +1736,7 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload, if ( ! pciu->pPutNotify ) { /* * send error and go to next request - * if there isnt enough memory left + * if there isn't enough memory left */ log_header ( "no memory to initiate put notify", client, mp, pPayload, 0 ); @@ -2144,7 +2144,7 @@ int rsrv_version_reply ( struct client *client ) SEND_LOCK ( client ); /* * sequence number is specified zero when we copy in the - * header because we dont know it until we receive a datagram + * header because we don't know it until we receive a datagram * from the client */ status = cas_copy_in_header ( client, CA_PROTO_VERSION, @@ -2210,7 +2210,7 @@ static int search_reply_udp ( caHdrLargeArray *mp, void *pPayload, struct client * starting with V4.4 the count field is used (abused) * to store the minor version number of the client. * - * New versions dont alloc the channel in response + * New versions don't alloc the channel in response * to a search request. * For these, allocation has been moved to claim_ciu_action(). * @@ -2285,7 +2285,7 @@ static int search_reply_tcp ( } /* - * stop further use of server if memory becomes scarse + * stop further use of server if memory becomes scarce */ spaceAvailOnFreeList = freeListItemsAvail ( rsrvChanFreeList ) > 0 && freeListItemsAvail ( rsrvEventFreeList ) > reasonableMonitorSpace; @@ -2397,7 +2397,7 @@ int camessage ( struct client *client ) assert(pCaBucket); - /* drain remnents of large messages that will not fit */ + /* drain remnants of large messages that will not fit */ if ( client->recvBytesToDrain ) { if ( client->recvBytesToDrain >= client->recv.cnt ) { client->recvBytesToDrain -= client->recv.cnt; @@ -2472,7 +2472,7 @@ int camessage ( struct client *client ) } /* - * disconnect clients that dont send 8 byte + * disconnect clients that don't send 8 byte * aligned payloads */ if ( msgsize & 0x7 ) { diff --git a/modules/database/src/ioc/rsrv/camsgtask.c b/modules/database/src/ioc/rsrv/camsgtask.c index bcd30d1bd..eee7ab238 100644 --- a/modules/database/src/ioc/rsrv/camsgtask.c +++ b/modules/database/src/ioc/rsrv/camsgtask.c @@ -50,7 +50,7 @@ void camsgtask ( void *pParm ) int status; /* - * allow message to batch up if more are comming + * allow message to batch up if more are coming */ status = socket_ioctl (client->sock, FIONREAD, &check_nchars); if (status < 0) { diff --git a/modules/database/src/ioc/rsrv/caservertask.c b/modules/database/src/ioc/rsrv/caservertask.c index 4b37ab7e9..4cff62224 100644 --- a/modules/database/src/ioc/rsrv/caservertask.c +++ b/modules/database/src/ioc/rsrv/caservertask.c @@ -545,7 +545,7 @@ void rsrv_init (void) beacon_startStopEvent = epicsEventMustCreate(epicsEventEmpty); castcp_ctl = ctlPause; - /* Thread priorites + /* Thread priorities * Now starting per interface * TCP Listener: epicsThreadPriorityCAServerLow-2 * Name receiver: epicsThreadPriorityCAServerLow-4 @@ -1204,7 +1204,7 @@ void destroy_tcp_client ( struct client *client ) assert ( ! status ); /* - * wait for extra labor in progress to comple + * wait for extra labor in progress to complete */ db_flush_extra_labor_event ( client->evuser ); } @@ -1229,7 +1229,7 @@ struct client * create_client ( SOCKET sock, int proto ) size_t spaceNeeded; /* - * stop further use of server if memory becomes scarse + * stop further use of server if memory becomes scarce */ spaceAvailOnFreeList = freeListItemsAvail ( rsrvClientFreeList ) > 0 && freeListItemsAvail ( rsrvSmallBufFreeListTCP ) > 0; diff --git a/modules/database/src/ioc/rsrv/cast_server.c b/modules/database/src/ioc/rsrv/cast_server.c index 0668c63a9..a18c41015 100644 --- a/modules/database/src/ioc/rsrv/cast_server.c +++ b/modules/database/src/ioc/rsrv/cast_server.c @@ -16,7 +16,7 @@ * Improvements * ------------ * .01 - * Dont send channel found message unless there is memory, a task slot, + * Don't send channel found message unless there is memory, a task slot, * and a TCP socket available. Send a diagnostic instead. * Or ... make the timeout shorter? This is only a problem if * they persist in trying to make a connection after getting no @@ -269,9 +269,9 @@ void cast_server(void *pParm) } /* - * allow messages to batch up if more are comming + * allow messages to batch up if more are coming */ - nchars = 0; /* supress purify warning */ + nchars = 0; /* suppress purify warning */ status = socket_ioctl(recv_sock, FIONREAD, &nchars); if (status<0) { errlogPrintf ("CA cast server: Unable to fetch N characters pending\n"); diff --git a/modules/database/src/ioc/rsrv/server.h b/modules/database/src/ioc/rsrv/server.h index c0593739e..604880c12 100644 --- a/modules/database/src/ioc/rsrv/server.h +++ b/modules/database/src/ioc/rsrv/server.h @@ -239,7 +239,7 @@ void initializePutNotifyFreeList (void); unsigned rsrvSizeOfPutNotify ( struct rsrv_put_notify *pNotify ); /* - * inclming protocol maintetnance + * incoming protocol maintenance */ void casExpandRecvBuffer ( struct client *pClient, ca_uint32_t size ); diff --git a/modules/database/src/std/dev/devBoSoft.c b/modules/database/src/std/dev/devBoSoft.c index 59c402367..c20e5d2cd 100644 --- a/modules/database/src/std/dev/devBoSoft.c +++ b/modules/database/src/std/dev/devBoSoft.c @@ -43,7 +43,7 @@ static long init_record(dbCommon *pcommon) { long status=0; - /* dont convert */ + /* don't convert */ status=2; return status; diff --git a/modules/database/src/std/rec/aaoRecord.c b/modules/database/src/std/rec/aaoRecord.c index e96f2b7d0..c9939b343 100644 --- a/modules/database/src/std/rec/aaoRecord.c +++ b/modules/database/src/std/rec/aaoRecord.c @@ -162,7 +162,7 @@ static long process(struct dbCommon *pcommon) prec->udf = FALSE; /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } @@ -357,7 +357,7 @@ static long writeValue(aaoRecord *prec) case menuYesNoYES: { recGblSetSevr(prec, SIMM_ALARM, prec->sims); if (prec->pact || (prec->sdly < 0.)) { - /* Device suport is responsible for buffer + /* Device support is responsible for buffer which might be write-only so we may not be allowed to call dbPutLink on it. Maybe also device support has an advanced diff --git a/modules/database/src/std/rec/aiRecord.c b/modules/database/src/std/rec/aiRecord.c index 8d31b07ff..72a4c61f5 100644 --- a/modules/database/src/std/rec/aiRecord.c +++ b/modules/database/src/std/rec/aiRecord.c @@ -43,7 +43,7 @@ #undef GEN_SIZE_OFFSET #include "epicsExport.h" -/* Hysterisis for alarm filtering: 1-1/e */ +/* Hysteresis for alarm filtering: 1-1/e */ #define THRESHOLD 0.6321 /* Create RSET - Record Support Entry Table*/ diff --git a/modules/database/src/std/rec/aoRecord.c b/modules/database/src/std/rec/aoRecord.c index 022424054..a7a31ab7a 100644 --- a/modules/database/src/std/rec/aoRecord.c +++ b/modules/database/src/std/rec/aoRecord.c @@ -188,7 +188,7 @@ static long process(struct dbCommon *pcommon) if(!status) convert(prec, value); prec->udf = isnan(prec->val); /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/boRecord.c b/modules/database/src/std/rec/boRecord.c index 05195b880..ca254adde 100644 --- a/modules/database/src/std/rec/boRecord.c +++ b/modules/database/src/std/rec/boRecord.c @@ -211,7 +211,7 @@ static long process(struct dbCommon *pcommon) } else prec->rval = (epicsUInt32)prec->val; /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/calcRecord.c b/modules/database/src/std/rec/calcRecord.c index 8bb9435fa..4467c7080 100644 --- a/modules/database/src/std/rec/calcRecord.c +++ b/modules/database/src/std/rec/calcRecord.c @@ -37,7 +37,7 @@ #undef GEN_SIZE_OFFSET #include "epicsExport.h" -/* Hysterisis for alarm filtering: 1-1/e */ +/* Hysteresis for alarm filtering: 1-1/e */ #define THRESHOLD 0.6321 /* Create RSET - Record Support Entry Table */ diff --git a/modules/database/src/std/rec/calcoutRecord.c b/modules/database/src/std/rec/calcoutRecord.c index eadcc5862..319994596 100644 --- a/modules/database/src/std/rec/calcoutRecord.c +++ b/modules/database/src/std/rec/calcoutRecord.c @@ -245,7 +245,7 @@ static long process(struct dbCommon *pcommon) if ( !pact ) { /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStamp(prec); } /* check for output link execution */ diff --git a/modules/database/src/std/rec/histogramRecord.c b/modules/database/src/std/rec/histogramRecord.c index 44b278f39..9f35870ed 100644 --- a/modules/database/src/std/rec/histogramRecord.c +++ b/modules/database/src/std/rec/histogramRecord.c @@ -160,7 +160,7 @@ static long init_record(struct dbCommon *pcommon, int pass) prec->bptr = calloc(prec->nelm, sizeof(epicsUInt32)); } - /* calulate width of array element */ + /* calculate width of array element */ prec->wdth = (prec->ulim - prec->llim) / prec->nelm; return 0; } diff --git a/modules/database/src/std/rec/int64inRecord.c b/modules/database/src/std/rec/int64inRecord.c index 2cd804d07..d4ea757c3 100644 --- a/modules/database/src/std/rec/int64inRecord.c +++ b/modules/database/src/std/rec/int64inRecord.c @@ -40,7 +40,7 @@ #undef GEN_SIZE_OFFSET #include "epicsExport.h" - /* Hysterisis for alarm filtering: 1-1/e */ + /* Hysteresis for alarm filtering: 1-1/e */ #define THRESHOLD 0.6321 /* Create RSET - Record Support Entry Table*/ #define report NULL diff --git a/modules/database/src/std/rec/int64outRecord.c b/modules/database/src/std/rec/int64outRecord.c index bf306e8e0..d5747f0c2 100644 --- a/modules/database/src/std/rec/int64outRecord.c +++ b/modules/database/src/std/rec/int64outRecord.c @@ -146,7 +146,7 @@ static long process(dbCommon *pcommon) if (!status) convert(prec,value); /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/longinRecord.c b/modules/database/src/std/rec/longinRecord.c index a6b58eef4..2bd8a8350 100644 --- a/modules/database/src/std/rec/longinRecord.c +++ b/modules/database/src/std/rec/longinRecord.c @@ -41,7 +41,7 @@ #undef GEN_SIZE_OFFSET #include "epicsExport.h" - /* Hysterisis for alarm filtering: 1-1/e */ + /* Hysteresis for alarm filtering: 1-1/e */ #define THRESHOLD 0.6321 /* Create RSET - Record Support Entry Table*/ #define report NULL diff --git a/modules/database/src/std/rec/longoutRecord.c b/modules/database/src/std/rec/longoutRecord.c index f0e2252bd..faab03083 100644 --- a/modules/database/src/std/rec/longoutRecord.c +++ b/modules/database/src/std/rec/longoutRecord.c @@ -148,7 +148,7 @@ static long process(struct dbCommon *pcommon) if (!status) convert(prec,value); /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/mbbiRecord.c b/modules/database/src/std/rec/mbbiRecord.c index c8853f0ec..8bb14c647 100644 --- a/modules/database/src/std/rec/mbbiRecord.c +++ b/modules/database/src/std/rec/mbbiRecord.c @@ -40,7 +40,7 @@ #undef GEN_SIZE_OFFSET #include "epicsExport.h" -/* Hysterisis for alarm filtering: 1-1/e */ +/* Hysteresis for alarm filtering: 1-1/e */ #define THRESHOLD 0.6321 /* Create RSET - Record Support Entry Table*/ @@ -177,7 +177,7 @@ static long process(struct dbCommon *pcommon) if (prec->sdef) { pstate_values = &(prec->zrvl); - prec->val = 65535; /* Initalize to unknown state*/ + prec->val = 65535; /* Initialize to unknown state*/ for (i = 0; i < 16; i++) { if (*pstate_values == rval) { prec->val = i; diff --git a/modules/database/src/std/rec/mbboDirectRecord.c b/modules/database/src/std/rec/mbboDirectRecord.c index b2b531572..7c5ba294c 100644 --- a/modules/database/src/std/rec/mbboDirectRecord.c +++ b/modules/database/src/std/rec/mbboDirectRecord.c @@ -196,7 +196,7 @@ static long process(struct dbCommon *pcommon) convert(prec); /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/mbboRecord.c b/modules/database/src/std/rec/mbboRecord.c index 83448f19a..5acde7515 100644 --- a/modules/database/src/std/rec/mbboRecord.c +++ b/modules/database/src/std/rec/mbboRecord.c @@ -151,7 +151,7 @@ static long init_record(struct dbCommon *pcommon, int pass) epicsUInt32 *pstate_values = &prec->zrvl; int i; - prec->val = 65535; /* initalize to unknown state */ + prec->val = 65535; /* initialize to unknown state */ for (i = 0; i < 16; i++) { if (*pstate_values == rval) { prec->val = i; @@ -217,7 +217,7 @@ static long process(struct dbCommon *pcommon) convert(prec); /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); } diff --git a/modules/database/src/std/rec/stringoutRecord.c b/modules/database/src/std/rec/stringoutRecord.c index e84484485..6f468c9a4 100644 --- a/modules/database/src/std/rec/stringoutRecord.c +++ b/modules/database/src/std/rec/stringoutRecord.c @@ -148,7 +148,7 @@ static long process(struct dbCommon *pcommon) } /* Update the timestamp before writing output values so it - * will be uptodate if any downstream records fetch it via TSEL */ + * will be up to date if any downstream records fetch it via TSEL */ recGblGetTimeStampSimm(prec, prec->simm, NULL); if (prec->nsev < INVALID_ALARM ) diff --git a/modules/database/test/ioc/db/dbCACTest.cpp b/modules/database/test/ioc/db/dbCACTest.cpp index 0420fb228..e008fb0db 100644 --- a/modules/database/test/ioc/db/dbCACTest.cpp +++ b/modules/database/test/ioc/db/dbCACTest.cpp @@ -6,7 +6,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * Part of dbCaLinkTest, compiled seperately to avoid + * Part of dbCaLinkTest, compiled separately to avoid * dbAccess.h vs. db_access.h conflicts */ diff --git a/modules/database/test/ioc/db/dbStressLock.c b/modules/database/test/ioc/db/dbStressLock.c index 529050f6c..6cac59fe2 100644 --- a/modules/database/test/ioc/db/dbStressLock.c +++ b/modules/database/test/ioc/db/dbStressLock.c @@ -9,7 +9,7 @@ /* * Lockset stress test. * - * The test stratagy is for N threads to contend for M records. + * The test strategy is for N threads to contend for M records. * Each thread will perform one of three operations: * 1) Lock a single record. * 2) Lock several records. diff --git a/modules/database/test/ioc/db/jlinkz.c b/modules/database/test/ioc/db/jlinkz.c index 1b4dc2c2e..087cc0520 100644 --- a/modules/database/test/ioc/db/jlinkz.c +++ b/modules/database/test/ioc/db/jlinkz.c @@ -95,7 +95,7 @@ long z_getval(struct link *plink, short dbrType, void *pbuffer, return ret; } -/* TODO: atomicly get value and alarm */ +/* TODO: atomically get value and alarm */ static long z_getalarm(const struct link *plink, epicsEnum16 *status, epicsEnum16 *severity) diff --git a/modules/database/test/std/rec/dbHeaderTest.c b/modules/database/test/std/rec/dbHeaderTest.c index 20472c24d..7a45ee415 100644 --- a/modules/database/test/std/rec/dbHeaderTest.c +++ b/modules/database/test/std/rec/dbHeaderTest.c @@ -6,7 +6,7 @@ \*************************************************************************/ /* This test includes all public headers from libCom and database modules - * to ensure they are all syntaxtically correct in both C and C++ + * to ensure they are all syntactically correct in both C and C++ */ #include diff --git a/modules/libcom/RTEMS/posix/rtems_init.c b/modules/libcom/RTEMS/posix/rtems_init.c index 09c7d60a5..ae3e8b5b9 100644 --- a/modules/libcom/RTEMS/posix/rtems_init.c +++ b/modules/libcom/RTEMS/posix/rtems_init.c @@ -362,7 +362,7 @@ initialize_remote_filesystem(char **argv, int hasLocalFilesystem) argv[1] = rtems_bsdnet_bootp_cmdline; /* * Its probably common to embed the mount point in the server - * name so, when this is occurring, dont clobber the mount point + * name so, when this is occurring, don't clobber the mount point * by appending the first node from the command path. This allows * the mount point to be a different path then the server's mount * path. @@ -883,7 +883,7 @@ telnet_pseudoIocsh(char *name, __attribute__((unused))void *arg) /* * Telnet daemon configuration - * 0 or NULL for most fields in thsi struct indicate default values to RTEMS. + * 0 or NULL for most fields in this struct indicate default values to RTEMS. */ rtems_telnetd_config_table rtems_telnetd_config = { .command = SHELL_ENTRY, @@ -990,7 +990,7 @@ POSIX_Init ( void *argument __attribute__((unused))) /* Let other tasks run to complete background work */ default_network_set_self_prio(RTEMS_MAXIMUM_PRIORITY - 1U); - /* supress all output from bsd network initialization */ + /* suppress all output from bsd network initialization */ rtems_bsd_set_vprintf_handler(rtems_bsd_vprintf_handler_mute); sc = rtems_bsd_initialize(); diff --git a/modules/libcom/RTEMS/rtems_netconfig.c b/modules/libcom/RTEMS/rtems_netconfig.c index 0207512c7..38fb6bfce 100644 --- a/modules/libcom/RTEMS/rtems_netconfig.c +++ b/modules/libcom/RTEMS/rtems_netconfig.c @@ -10,7 +10,7 @@ * eric.norum@usask.ca * (306) 966-5394 * - * This file can be copied to an application source dirctory + * This file can be copied to an application source directory * and modified to override the values shown below. */ #include diff --git a/modules/libcom/RTEMS/rtems_util.c b/modules/libcom/RTEMS/rtems_util.c index 84571e7fd..acbb5f17c 100644 --- a/modules/libcom/RTEMS/rtems_util.c +++ b/modules/libcom/RTEMS/rtems_util.c @@ -5,7 +5,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * RTEMS utilitiy routines for EPICS + * RTEMS utility routines for EPICS * Author: W. Eric Norum * eric@cls.usask.ca * (306) 966-6055 diff --git a/modules/libcom/RTEMS/score/rtems_init.c b/modules/libcom/RTEMS/score/rtems_init.c index 986e09623..f8cd62d5d 100644 --- a/modules/libcom/RTEMS/score/rtems_init.c +++ b/modules/libcom/RTEMS/score/rtems_init.c @@ -297,7 +297,7 @@ initialize_remote_filesystem(char **argv, int hasLocalFilesystem) argv[1] = rtems_bsdnet_bootp_cmdline; /* * Its probably common to embed the mount point in the server - * name so, when this is occurring, dont clobber the mount point + * name so, when this is occurring, don't clobber the mount point * by appending the first node from the command path. This allows * the mount point to be a different path then the server's mount * path. diff --git a/modules/libcom/RTEMS/setBootConfigFromNVRAM.c b/modules/libcom/RTEMS/setBootConfigFromNVRAM.c index deb9f0654..9f1b3e4e7 100644 --- a/modules/libcom/RTEMS/setBootConfigFromNVRAM.c +++ b/modules/libcom/RTEMS/setBootConfigFromNVRAM.c @@ -267,7 +267,7 @@ setBootConfigFromNVRAM(void) return; /* - * Get network configuation from PPCBUG. + * Get network configuration from PPCBUG. * The 'correct' way to do this would be to issue a .NETCFIG PPCBUG * system call. Unfortunately it is very difficult to issue such a * call once RTEMS is up and running so we just copy from the 'known' diff --git a/modules/libcom/src/as/asLibRoutines.c b/modules/libcom/src/as/asLibRoutines.c index d5767fd28..fce4a41c2 100644 --- a/modules/libcom/src/as/asLibRoutines.c +++ b/modules/libcom/src/as/asLibRoutines.c @@ -497,7 +497,7 @@ long epicsStdCall asCompute(ASCLIENTPVT asClientPvt) return(status); } -/*The dump routines do not lock. Thus they may get inconsistant data.*/ +/*The dump routines do not lock. Thus they may get inconsistent data.*/ /*HOWEVER if they did lock and a user interrupts one of then then BAD BAD*/ static const char *asAccessName[] = {"NONE","READ","WRITE"}; static const char *asTrapOption[] = {"NOTRAPWRITE","TRAPWRITE"}; diff --git a/modules/libcom/src/as/asTrapWrite.h b/modules/libcom/src/as/asTrapWrite.h index 008fbc140..0d9f4d99b 100644 --- a/modules/libcom/src/as/asTrapWrite.h +++ b/modules/libcom/src/as/asTrapWrite.h @@ -30,8 +30,8 @@ extern "C" { * \brief The message passed to registered listeners. */ typedef struct asTrapWriteMessage { - const char *userid; /**< \brief Userid of whoever orginated the request. */ - const char *hostid; /**< \brief Hostid of whoever orginated the request. */ + const char *userid; /**< \brief Userid of whoever originated the request. */ + const char *hostid; /**< \brief Hostid of whoever originated the request. */ /** \brief A field for use by the server. * * Any listener that uses this field must know what type of diff --git a/modules/libcom/src/bucketLib/bucketLib.c b/modules/libcom/src/bucketLib/bucketLib.c index 95890a2cf..5fcc3c36c 100644 --- a/modules/libcom/src/bucketLib/bucketLib.c +++ b/modules/libcom/src/bucketLib/bucketLib.c @@ -347,7 +347,7 @@ static int bucketAddItem(BUCKET *prb, bucketSET *pBSET, const void *pId, const v assert ((hashid & ~prb->hashIdMask) == 0); ppi = &prb->pTable[hashid]; /* - * Dont reuse a resource id ! + * Don't reuse a resource id ! */ ppiExists = (*pBSET->pCompare) (ppi, pId); if (ppiExists) { diff --git a/modules/libcom/src/calc/calcPerform.c b/modules/libcom/src/calc/calcPerform.c index 1510308bb..39b1c3f9d 100644 --- a/modules/libcom/src/calc/calcPerform.c +++ b/modules/libcom/src/calc/calcPerform.c @@ -288,7 +288,7 @@ LIBCOM_API long break; /* Be VERY careful converting double to int in case bit 31 is set! - * Out-of-range errors give very different results on different sytems. + * Out-of-range errors give very different results on different systems. * Convert negative doubles to signed and positive doubles to unsigned * first to avoid overflows if bit 32 is set. * The result is always signed, values with bit 31 set are negative diff --git a/modules/libcom/src/calc/postfix.h b/modules/libcom/src/calc/postfix.h index eb47613b6..d4c4dea9b 100644 --- a/modules/libcom/src/calc/postfix.h +++ b/modules/libcom/src/calc/postfix.h @@ -122,7 +122,7 @@ extern "C" { * \param perror Place to return an error code * \return Non-zero value in event of error * - * It is the callers's responsibility to ensure that \c ppostfix points + * It is the caller's responsibility to ensure that \c ppostfix points * to sufficient storage to hold the postfix expression. The macro * INFIX_TO_POSTFIX_SIZE(n) can be used to calculate an appropriate * postfix buffer size from the length of the infix buffer. @@ -212,7 +212,7 @@ extern "C" { * * -# ***Algebraic Functions*** * Various algebraic functions are available which take parameters inside - * parentheses. The parameter seperator is a comma. + * parentheses. The parameter separator is a comma. * * - Absolute value: abs(a) * - Exponential ea: exp(a) @@ -291,7 +291,7 @@ extern "C" { * - a < 360 ? a+1 : 0 * * -# ***Parentheses*** - * Sub-expressions can be placed within parentheses to override operator precence rules. + * Sub-expressions can be placed within parentheses to override operator presence rules. * Parentheses can be nested to any depth, but the intermediate value stack used by * the expression evaluation engine is limited to 80 results (which require an * expression at least 321 characters long to reach). @@ -323,7 +323,7 @@ LIBCOM_API long * bitmaps which return that information to the caller. Passing a NULL value * for either of these pointers is legal if only the other is needed. * - * The least signficant bit (bit 0) of the bitmap at \c *pinputs will be set + * The least significant bit (bit 0) of the bitmap at \c *pinputs will be set * if the expression depends on the argument A, and so on through bit 11 for * the argument L. An argument that is not used until after a value has been * assigned to it will not be set in the pinputs bitmap, thus the bits can diff --git a/modules/libcom/src/cvtFast/cvtFast.c b/modules/libcom/src/cvtFast/cvtFast.c index 9cfbd4271..28abfe2c1 100644 --- a/modules/libcom/src/cvtFast/cvtFast.c +++ b/modules/libcom/src/cvtFast/cvtFast.c @@ -93,7 +93,7 @@ int cvtFloatToString(float flt_value, char *pdest, /* fraction */ if (precision > 0){ - /* convert fractional portional to ASCII */ + /* convert fractional portion to ASCII */ *pdest = '.'; pdest++; for (fplace /= 10, i = precision; i > 0; fplace /= 10,i--){ @@ -174,7 +174,7 @@ int cvtDoubleToString( /* fraction */ if (precision > 0){ - /* convert fractional portional to ASCII */ + /* convert fractional portion to ASCII */ *pdest = '.'; pdest++; for (fplace /= 10, i = precision; i > 0; fplace /= 10,i--){ diff --git a/modules/libcom/src/cxxTemplates/epicsSingleton.h b/modules/libcom/src/cxxTemplates/epicsSingleton.h index 817b7966c..f898f6519 100644 --- a/modules/libcom/src/cxxTemplates/epicsSingleton.h +++ b/modules/libcom/src/cxxTemplates/epicsSingleton.h @@ -63,7 +63,7 @@ public: }; friend class reference; epicsSingleton () {} - // mutex lock/unlock pair overhead incured + // mutex lock/unlock pair overhead incurred // when either of these are called reference getReference (); const reference getReference () const; @@ -168,12 +168,12 @@ inline void * SingletonUntyped :: pInstance () const inline SingletonUntyped :: ~SingletonUntyped () { - // we dont assert fail on non-zero _refCount + // we don't assert fail on non-zero _refCount // and or non nill _pInstance here because this - // is designed to tolarate situations where + // is designed to tolerate situations where // file scope epicsSingleton objects (which - // theoretically dont have storage lifespan - // issues) are deleted in a non-determanistic + // theoretically don't have storage lifespan + // issues) are deleted in a non-deterministic // order # if 0 assert ( _refCount == 0 ); diff --git a/modules/libcom/src/cxxTemplates/resourceLib.h b/modules/libcom/src/cxxTemplates/resourceLib.h index 0f3e762c0..28aca6f59 100644 --- a/modules/libcom/src/cxxTemplates/resourceLib.h +++ b/modules/libcom/src/cxxTemplates/resourceLib.h @@ -13,7 +13,7 @@ * indexing is implemented with a hash lookup. The identifier type * implements the hash algorithm (or derives from one of the supplied * identifier types which provide a hashing routine). The table expands - * dynamically depending on load, and without introducing non-determanistic + * dynamically depending on load, and without introducing non-deterministic * latency. * * Unsigned integer and string identifier classes are supplied here. @@ -86,13 +86,13 @@ public: void removeAll ( tsSLList & destination ); // remove all entries T * lookup ( const ID &idIn ) const; // locate entry // Call (pT->*pCB) () for each entry but expect poor performance - // with sparcely populated tables + // with sparsely populated tables void traverse ( void (T::*pCB)() ); void traverseConst ( void (T::*pCB)() const ) const; unsigned numEntriesInstalled () const; void setTableSize ( const unsigned newTableSize ); // iterate through all entries but expect poor performance - // with sparcely populated tables + // with sparsely populated tables typedef resTableIter < T, ID > iterator; typedef resTableIterConst < T, ID > iteratorConst; iterator firstIter (); @@ -523,7 +523,7 @@ inline unsigned resTable::tableSize () const } } -// it will be more efficent to call this once prior to installing +// it will be more efficient to call this once prior to installing // the first entry template void resTable::setTableSize ( const unsigned newTableSize ) @@ -550,12 +550,12 @@ void resTable::setTableSize ( const unsigned newTableSize ) template bool resTable::setTableSizePrivate ( unsigned logBaseTwoTableSizeIn ) { - // dont shrink + // don't shrink if ( this->logBaseTwoTableSize >= logBaseTwoTableSizeIn ) { return true; } - // dont allow ridiculously small tables + // don't allow ridiculously small tables if ( logBaseTwoTableSizeIn < 4 ) { logBaseTwoTableSizeIn = 4; } @@ -1036,14 +1036,14 @@ inline resTableIndex integerHash ( unsigned MIN_INDEX_WIDTH, resTableIndex hashid = static_cast ( id ); // - // the intent here is to gurantee that all components of the + // the intent here is to guarantee that all components of the // integer contribute even if the resTableIndex returned might // index a small table. // // On most compilers the optimizer will unroll this loop so this // is actually a very small inline function // - // Experiments using the microsoft compiler show that this isnt + // Experiments using the microsoft compiler show that this isn't // slower than switching on the architecture size and unrolling the // loop explicitly (that solution has resulted in portability // problems in the past). @@ -1142,7 +1142,7 @@ stringId::~stringId() // each cast away of const, but in this case // it cant be avoided. // - // The DEC compiler complains that const isnt + // The DEC compiler complains that const isn't // really significant in a cast if it is present. // // I hope that deleting a pointer to "char" diff --git a/modules/libcom/src/cxxTemplates/tsDLList.h b/modules/libcom/src/cxxTemplates/tsDLList.h index 38073ff63..87b9f7cf3 100644 --- a/modules/libcom/src/cxxTemplates/tsDLList.h +++ b/modules/libcom/src/cxxTemplates/tsDLList.h @@ -434,7 +434,7 @@ inline void tsDLList::push (T &item) // // tsDLList::find () -// returns -1 if the item isnt on the list +// returns -1 if the item isn't on the list // and the node number (beginning with zero if // it is) // diff --git a/modules/libcom/src/cxxTemplates/tsFreeList.h b/modules/libcom/src/cxxTemplates/tsFreeList.h index 94c8ec769..f1223fa27 100644 --- a/modules/libcom/src/cxxTemplates/tsFreeList.h +++ b/modules/libcom/src/cxxTemplates/tsFreeList.h @@ -44,7 +44,7 @@ // // NOTES: // -// 1) A NOOP mutex class may be specified if mutual exclusion isnt required +// 1) A NOOP mutex class may be specified if mutual exclusion isn't required // // 2) If you wish to force use of the new operator, then declare your class's // destructor as a protected member function. diff --git a/modules/libcom/src/dbmf/dbmf.c b/modules/libcom/src/dbmf/dbmf.c index 346dde7aa..0a14f8919 100644 --- a/modules/libcom/src/dbmf/dbmf.c +++ b/modules/libcom/src/dbmf/dbmf.c @@ -11,7 +11,7 @@ * Author: Jim Kowalkowski and Marty Kraimer * Date: 4/97 * - * Intended for applications that create and free requently + * Intended for applications that create and free frequently * */ diff --git a/modules/libcom/src/dbmf/dbmf.h b/modules/libcom/src/dbmf/dbmf.h index 082973a84..f1df3d31c 100644 --- a/modules/libcom/src/dbmf/dbmf.h +++ b/modules/libcom/src/dbmf/dbmf.h @@ -21,7 +21,7 @@ * * Routines whin iocCore like dbLoadDatabase() have the following attributes: * - They repeatedly call malloc() followed soon afterwards by a call to - * free() the temporaryily allocated storage. + * free() the temporarily allocated storage. * - Between those calls to malloc() and free(), additional calls to * malloc() are made that do NOT have an associated free(). * diff --git a/modules/libcom/src/ellLib/ellLib.c b/modules/libcom/src/ellLib/ellLib.c index b35a77c27..c0e257747 100644 --- a/modules/libcom/src/ellLib/ellLib.c +++ b/modules/libcom/src/ellLib/ellLib.c @@ -39,9 +39,9 @@ void ellAdd (ELLLIST *pList, ELLNODE *pNode) } /**************************************************************************** * - * This function concatinates the second linked list to the end of the first + * This function concatenates the second linked list to the end of the first * list. The second list is left empty. Either list (or both) lists may - * be empty at the begining of the operation. + * be empty at the beginning of the operation. * *****************************************************************************/ void ellConcat (ELLLIST *pDstList, ELLLIST *pAddList) diff --git a/modules/libcom/src/error/errlog.c b/modules/libcom/src/error/errlog.c index 073cb9950..90241c473 100644 --- a/modules/libcom/src/error/errlog.c +++ b/modules/libcom/src/error/errlog.c @@ -535,7 +535,7 @@ void errlogFlush(void) if (pvtData.atExit) return; - /*If nothing in queue dont wake up errlogThread*/ + /*If nothing in queue don't wake up errlogThread*/ epicsMutexMustLock(pvtData.msgQueueLock); count = ellCount(&pvtData.msgQueue); epicsMutexUnlock(pvtData.msgQueueLock); diff --git a/modules/libcom/src/fdmgr/fdManager.cpp b/modules/libcom/src/fdmgr/fdManager.cpp index e23ad1075..225fd7985 100644 --- a/modules/libcom/src/fdmgr/fdManager.cpp +++ b/modules/libcom/src/fdmgr/fdManager.cpp @@ -159,7 +159,7 @@ LIBCOM_API void fdManager::process (double delay) if (this->pCBReg != NULL) { // // check only after we see that it is non-null so - // that we dont trigger bounds-checker dangling pointer + // that we don't trigger bounds-checker dangling pointer // error // assert (this->pCBReg==pReg); @@ -177,8 +177,8 @@ LIBCOM_API void fdManager::process (double delay) else if ( status < 0 ) { int errnoCpy = SOCKERRNO; - // dont depend on flags being properly set if - // an error is retuned from select + // don't depend on flags being properly set if + // an error is returned from select for ( size_t i = 0u; i < fdrNEnums; i++ ) { FD_ZERO ( &fdSetsPtr[i] ); } diff --git a/modules/libcom/src/fdmgr/fdmgr.cpp b/modules/libcom/src/fdmgr/fdmgr.cpp index b4c170dae..bc62ba9b2 100644 --- a/modules/libcom/src/fdmgr/fdmgr.cpp +++ b/modules/libcom/src/fdmgr/fdmgr.cpp @@ -318,7 +318,7 @@ extern "C" LIBCOM_API int epicsStdCall fdmgr_delete (fdctx *pfdctx) } /* - * depricated interface + * deprecated interface */ extern "C" LIBCOM_API int epicsStdCall fdmgr_clear_fd (fdctx *pfdctx, SOCKET fd) { @@ -326,7 +326,7 @@ extern "C" LIBCOM_API int epicsStdCall fdmgr_clear_fd (fdctx *pfdctx, SOCKET fd) } /* - * depricated interface + * deprecated interface */ extern "C" LIBCOM_API int epicsStdCall fdmgr_add_fd ( fdctx *pfdctx, SOCKET fd, void (*pfunc)(void *pParam), void *param) diff --git a/modules/libcom/src/fdmgr/fdmgr.h b/modules/libcom/src/fdmgr/fdmgr.h index 0930f0e6c..b0341094f 100644 --- a/modules/libcom/src/fdmgr/fdmgr.h +++ b/modules/libcom/src/fdmgr/fdmgr.h @@ -117,7 +117,7 @@ void *param /* first parameter passed to the func */ /* * - * Clear nterest in a type of file descriptor activity (IO). + * Clear interest in a type of file descriptor activity (IO). * */ LIBCOM_API int epicsStdCall fdmgr_clear_callback( diff --git a/modules/libcom/src/flex/dfa.c b/modules/libcom/src/flex/dfa.c index c92680b99..03f2011a7 100644 --- a/modules/libcom/src/flex/dfa.c +++ b/modules/libcom/src/flex/dfa.c @@ -128,7 +128,7 @@ void check_trailing_context(int *nfa_states, int num_states, int *accset, int na /* dump_associated_rules - list the rules associated with a DFA state * - * synopisis + * synopsis * int ds; * FILE *file; * dump_associated_rules( file, ds ); @@ -179,7 +179,7 @@ void dump_associated_rules(FILE *file, int ds) /* dump_transitions - list the transitions associated with a DFA state * - * synopisis + * synopsis * int state[numecs]; * FILE *file; * dump_transitions( file, state ); @@ -449,7 +449,7 @@ void ntod(void) * since for them we don't have a simple state number lying around with * which to index the table. We also don't bother doing it for scanners * unless (1) NUL is in its own equivalence class (indicated by a - * positive value of ecgroup[NUL]), (2) NUL's equilvalence class is + * positive value of ecgroup[NUL]), (2) NUL's equivalence class is * the last equivalence class, and (3) the number of equivalence classes * is the same as the number of characters. This latter case comes about * when useecs is false or when its true but every character still diff --git a/modules/libcom/src/flex/flexdef.h b/modules/libcom/src/flex/flexdef.h index a541a2fe0..0a9736e6c 100644 --- a/modules/libcom/src/flex/flexdef.h +++ b/modules/libcom/src/flex/flexdef.h @@ -602,7 +602,7 @@ void *reallocate_array(void *array, int size, int element_size); #define reallocate_character_array(array,size) \ (Char *) reallocate_array( (void *) array, size, sizeof( Char ) ) -#if 0 /* JRW this might couse truuble... but not for IOC usage */ +#if 0 /* JRW this might couse trouble... but not for IOC usage */ /* used to communicate between scanner and parser. The type should really * be YYSTYPE, but we can't easily get our hands on it. */ diff --git a/modules/libcom/src/iocsh/iocsh.h b/modules/libcom/src/iocsh/iocsh.h index a6fb50200..261866216 100644 --- a/modules/libcom/src/iocsh/iocsh.h +++ b/modules/libcom/src/iocsh/iocsh.h @@ -92,13 +92,13 @@ LIBCOM_API int epicsStdCall iocsh(const char *pathname); LIBCOM_API int epicsStdCall iocshCmd(const char *cmd); /** Read and evaluate IOC shell commands from the given file. * \param pathname Path to script file - * \param macros NULL or a comma seperated list of macro definitions. eg. "VAR1=x,VAR2=y" + * \param macros NULL or a comma separated list of macro definitions. eg. "VAR1=x,VAR2=y" * \return 0 on success, non-zero on error */ LIBCOM_API int epicsStdCall iocshLoad(const char *pathname, const char* macros); /** Evaluate a single IOC shell command * \param cmd Command string. eg. "echo \"something or other\"" - * \param macros NULL or a comma seperated list of macro definitions. eg. "VAR1=x,VAR2=y" + * \param macros NULL or a comma separated list of macro definitions. eg. "VAR1=x,VAR2=y" * \return 0 on success, non-zero on error */ LIBCOM_API int epicsStdCall iocshRun(const char *cmd, const char* macros); diff --git a/modules/libcom/src/log/iocLog.c b/modules/libcom/src/log/iocLog.c index 1caef654e..918ce8ec9 100644 --- a/modules/libcom/src/log/iocLog.c +++ b/modules/libcom/src/log/iocLog.c @@ -127,7 +127,7 @@ int epicsStdCall iocLogInit (void) return iocLogSuccess; } /* - * dont init twice + * don't init twice */ if (iocLogClient!=NULL) { return iocLogSuccess; diff --git a/modules/libcom/src/log/iocLogServer.c b/modules/libcom/src/log/iocLogServer.c index 08f9eca5f..0cee3a169 100644 --- a/modules/libcom/src/log/iocLogServer.c +++ b/modules/libcom/src/log/iocLogServer.c @@ -261,7 +261,7 @@ static int seekLatestLine (struct ioc_log_server *pserver) static const int tm_epoch_year = 1900; if (theDate.tm_year>tm_epoch_year) { theDate.tm_year -= tm_epoch_year; - theDate.tm_isdst = -1; /* dont know */ + theDate.tm_isdst = -1; /* don't know */ lineTime = mktime (&theDate); if ( lineTime != invalidTime ) { if (theLatestTime == invalidTime || @@ -590,7 +590,7 @@ static void writeMessagesToLog (struct iocLogClient *pclient) * find the first carrage return and create * an entry in the log for the message associated * with it. If a carrage return does not exist and - * the buffer isnt full then move the partial message + * the buffer isn't full then move the partial message * to the front of the buffer and wait for a carrage * return to arrive. If the buffer is full and there * is no carrage return then force the message out and diff --git a/modules/libcom/src/macLib/macCore.c b/modules/libcom/src/macLib/macCore.c index 9dd5927dd..7c3cf0690 100644 --- a/modules/libcom/src/macLib/macCore.c +++ b/modules/libcom/src/macLib/macCore.c @@ -54,7 +54,7 @@ typedef struct mac_entry { /*** Local function prototypes ***/ /* - * These static functions peform low-level operations on macro entries + * These static functions perform low-level operations on macro entries */ static MAC_ENTRY *first ( MAC_HANDLE *handle ); static MAC_ENTRY *last ( MAC_HANDLE *handle ); diff --git a/modules/libcom/src/misc/adjustment.c b/modules/libcom/src/misc/adjustment.c index 5873e5278..a5803c4e2 100644 --- a/modules/libcom/src/misc/adjustment.c +++ b/modules/libcom/src/misc/adjustment.c @@ -18,7 +18,7 @@ /* Up to now epicsShareThings have been declared as imports * (Appropriate for other stuff) * After setting the following they will be declared as exports - * (Appropriate for what we implenment) + * (Appropriate for what we implement) */ #include "adjustment.h" diff --git a/modules/libcom/src/misc/dbDefs.h b/modules/libcom/src/misc/dbDefs.h index 2b87793f2..29aabe697 100644 --- a/modules/libcom/src/misc/dbDefs.h +++ b/modules/libcom/src/misc/dbDefs.h @@ -50,7 +50,7 @@ /** \brief Find parent object from a member pointer * * Subtracts the byte offset of the member in the structure from the - * pointer to the member itself, giving a pointer to parent strucure. + * pointer to the member itself, giving a pointer to parent structure. * \param ptr Pointer to a member data field of a structure * \param structure Type name of the parent structure * \param member Field name of the data member diff --git a/modules/libcom/src/misc/epicsStdlib.c b/modules/libcom/src/misc/epicsStdlib.c index ad579511a..629e55765 100644 --- a/modules/libcom/src/misc/epicsStdlib.c +++ b/modules/libcom/src/misc/epicsStdlib.c @@ -1,5 +1,5 @@ /*************************************************************************\ -* Copyright (c) 2012 UChicago Argonna LLC, as Operator of Argonne +* Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. diff --git a/modules/libcom/src/misc/epicsStdlib.h b/modules/libcom/src/misc/epicsStdlib.h index e3cb69f91..660ad9abc 100644 --- a/modules/libcom/src/misc/epicsStdlib.h +++ b/modules/libcom/src/misc/epicsStdlib.h @@ -15,7 +15,7 @@ /** * \file epicsStdlib.h - * \brief Functions to convert strings to primative types + * \brief Functions to convert strings to primitive types * * These routines convert a string into an integer of the indicated type and * number base, or into a floating point type. The units pointer argument may @@ -163,7 +163,7 @@ LIBCOM_API int #define epicsParseFloat64(str, to, units) epicsParseDouble(str, to, units) /* These macros return 1 if successful, 0 on failure. - * This is analagous to the return value from sscanf() + * This is analogous to the return value from sscanf() */ /** diff --git a/modules/libcom/src/misc/epicsString.c b/modules/libcom/src/misc/epicsString.c index be6463438..ca61d9b8c 100644 --- a/modules/libcom/src/misc/epicsString.c +++ b/modules/libcom/src/misc/epicsString.c @@ -26,7 +26,7 @@ #ifndef vxWorks #include #else -/* VxWorks automaticaly includes stdint.h defining SIZE_MAX in 6.9 but not earlier */ +/* VxWorks automatically includes stdint.h defining SIZE_MAX in 6.9 but not earlier */ #ifndef SIZE_MAX #define SIZE_MAX (size_t)-1 #endif diff --git a/modules/libcom/src/misc/epicsTypes.h b/modules/libcom/src/misc/epicsTypes.h index 09e550d78..c3f713ed3 100644 --- a/modules/libcom/src/misc/epicsTypes.h +++ b/modules/libcom/src/misc/epicsTypes.h @@ -59,7 +59,7 @@ typedef epicsInt32 epicsStatus; #define MAX_STRING_SIZE 40 /** - * \brief !! Dont use this - it may vanish in the future !! + * \brief !! Don't use this - it may vanish in the future !! */ typedef struct { unsigned length; @@ -67,7 +67,7 @@ typedef struct { } epicsString; /** - * \brief !! Dont use this - it may vanish in the future !! + * \brief !! Don't use this - it may vanish in the future !! * * Provided only for backwards compatibility with * db_access.h diff --git a/modules/libcom/src/misc/epicsUnitTest.c b/modules/libcom/src/misc/epicsUnitTest.c index 45a060b94..a15af0a95 100644 --- a/modules/libcom/src/misc/epicsUnitTest.c +++ b/modules/libcom/src/misc/epicsUnitTest.c @@ -99,7 +99,7 @@ static void testOnce(void *dummy) { #ifdef HAVE_SETERROMODE /* SEM_FAILCRITICALERRORS - Don't display modal dialog * !SEM_NOALIGNMENTFAULTEXCEPT - auto-fix unaligned access - * !SEM_NOGPFAULTERRORBOX - enable Windows Error Reporting (also enables post-mortem debugger hooks) + * !SEM_NOGPFAULTERRORBOX - enable Windows Error Reporting (also enables postmortem debugger hooks) * SEM_NOOPENFILEERRORBOX - Don't display modal dialog */ SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); diff --git a/modules/libcom/src/misc/epicsUnitTest.h b/modules/libcom/src/misc/epicsUnitTest.h index 11c7aef61..66dd8f281 100644 --- a/modules/libcom/src/misc/epicsUnitTest.h +++ b/modules/libcom/src/misc/epicsUnitTest.h @@ -47,7 +47,7 @@ * be recorded as failures. * * Additional information can be supplied using the testDiag() routine, which - * displays the relevent information as a comment in the result output. None of + * displays the relevant information as a comment in the result output. None of * the printable strings passed to any testXxx() routine should contain a newline * '\n' character, newlines will be added by the test routines as part of the * Test Anything Protocol. For multiple lines of diagnostic output, call @@ -80,7 +80,7 @@ * server) can not be shut down cleanly. The function iocBuildIsolated() allows * to start an IOC without its Channel Access parts, so that it can be shutdown * quite cleanly using iocShutdown(). This feature is only intended to be used - * from test programs, do not use it on productional IOCs. After building the + * from test programs, do not use it on production IOCs. After building the * IOC using iocBuildIsolated() or iocBuild(), it has to be started by calling * iocRun(). The suggested call sequence in a test program that needs to run the * IOC without Channel Access is: @@ -238,7 +238,7 @@ LIBCOM_API int testDiag(const char *fmt, ...) */ LIBCOM_API int testDone(void); -/** \brief Return non-zero in shared/oversubscribed testing envrionments +/** \brief Return non-zero in shared/oversubscribed testing environments * * May be used to testSkip(), or select longer timeouts, for some cases * when the test process may be preempted for arbitrarily long times. diff --git a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp index bf730fec4..b5e863d59 100644 --- a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp +++ b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp @@ -338,7 +338,7 @@ void ipAddrToAsciiGlobal::run () { epicsGuardRelease < epicsMutex > unguard ( guard ); - // dont call callback with lock applied + // don't call callback with lock applied pCur->pCB->transactionComplete ( this->nameTmp ); } diff --git a/modules/libcom/src/misc/shareLib.h b/modules/libcom/src/misc/shareLib.h index 721dc07ff..3b049439b 100644 --- a/modules/libcom/src/misc/shareLib.h +++ b/modules/libcom/src/misc/shareLib.h @@ -74,7 +74,7 @@ * * By default shareLib.h sets the DLL import / export keywords to import from * a DLL so that, for DLL consumers (users), nothing special must be done. However, - * DLL implementors must set epicsExportSharedSymbols as above to specify + * DLL implementers must set epicsExportSharedSymbols as above to specify * which functions are exported from the DLL and which of them are imported * from other DLLs. * diff --git a/modules/libcom/src/misc/truncateFile.c b/modules/libcom/src/misc/truncateFile.c index 866432f1a..0cea958b6 100644 --- a/modules/libcom/src/misc/truncateFile.c +++ b/modules/libcom/src/misc/truncateFile.c @@ -21,7 +21,7 @@ #endif /* - * truncate to specified size (we dont use truncate() + * truncate to specified size (we don't use truncate() * because it is not portable) */ LIBCOM_API enum TF_RETURN truncateFile (const char *pFileName, unsigned long size) diff --git a/modules/libcom/src/osi/compiler/default/compilerSpecific.h b/modules/libcom/src/osi/compiler/default/compilerSpecific.h index 21eec60dc..253f972e1 100644 --- a/modules/libcom/src/osi/compiler/default/compilerSpecific.h +++ b/modules/libcom/src/osi/compiler/default/compilerSpecific.h @@ -17,7 +17,7 @@ #ifndef compilerSpecific_h #define compilerSpecific_h -/* The 'inline' key work, possibily with compiler +/* The 'inline' keyword, possibly with compiler * dependent flags to force inlineing where it would * otherwise not be done. * diff --git a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h index 43d4dc8f2..6e98f4d17 100644 --- a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h +++ b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h @@ -33,7 +33,7 @@ #ifdef __cplusplus /* - * in general we dont like ifdefs but they do allow us to check the + * in general we don't like ifdefs but they do allow us to check the * compiler version and make the optimistic assumption that * standards incompliance issues will be fixed by future compiler * releases diff --git a/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h b/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h index 8215c16bc..7e5bfe609 100644 --- a/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h +++ b/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h @@ -29,7 +29,7 @@ #ifdef __cplusplus /* - * in general we dont like ifdefs but they do allow us to check the + * in general we don't like ifdefs but they do allow us to check the * compiler version and make the optimistic assumption that * standards incompliance issues will be fixed by future compiler * releases diff --git a/modules/libcom/src/osi/devLibVME.c b/modules/libcom/src/osi/devLibVME.c index 9b228d350..e4d8bd244 100644 --- a/modules/libcom/src/osi/devLibVME.c +++ b/modules/libcom/src/osi/devLibVME.c @@ -149,7 +149,7 @@ long devBusToLocalAddr( volatile void *localAddress; /* - * Make sure that devLib has been intialized + * Make sure that devLib has been initialized */ if (!devLibInitFlag) { status = devLibInit(); @@ -264,7 +264,7 @@ long devRegisterAddress( * devReadProbe() * * a bus error safe "wordSize" read at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ long devReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue) { @@ -284,7 +284,7 @@ long devReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue) * devWriteProbe * * a bus error safe "wordSize" write at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ long devWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue) { @@ -1112,7 +1112,7 @@ long locationProbe (epicsAddressType addrType, char *pLocation) /****************************************************************************** * - * The follwing may, or may not be present in the BSP for the CPU in use. + * The following may, or may not be present in the BSP for the CPU in use. * */ /****************************************************************************** diff --git a/modules/libcom/src/osi/devLibVME.h b/modules/libcom/src/osi/devLibVME.h index d491f4297..87d172a8a 100644 --- a/modules/libcom/src/osi/devLibVME.h +++ b/modules/libcom/src/osi/devLibVME.h @@ -67,7 +67,7 @@ extern "C" { /** \brief Print a map of registered bus addresses. * - * Display a table of registsred bus address ranges, including the owner of + * Display a table of registered bus address ranges, including the owner of * each registered address. * \return 0, or an error status value */ @@ -246,7 +246,7 @@ LIBCOM_API int devInterruptInUseVME (unsigned vectorNumber); /** \brief Enable a VME interrupt level onto the CPU. * * The VMEbus allows multiple CPU boards to be installed in the same - * backplane. When this is done, the differente VME interrupt levels + * backplane. When this is done, the different VME interrupt levels * must be assigned to the CPUs since they cannot be shared. This * routine tells the VME interface that it should connect interrupts * from the indicated interrupt level to a CPU interrupt line. diff --git a/modules/libcom/src/osi/devLibVMEImpl.h b/modules/libcom/src/osi/devLibVMEImpl.h index e58f3a2b1..5b1a6b9d7 100644 --- a/modules/libcom/src/osi/devLibVMEImpl.h +++ b/modules/libcom/src/osi/devLibVMEImpl.h @@ -31,7 +31,7 @@ extern "C" { * \brief A table of function pointers for devLibVME implementations * * The global virtual OS table \ref pdevLibVME controls - * the behaviour of the functions defined in devLib.h. + * the behavior of the functions defined in devLib.h. * All of which call into the functions found in this table * to perform system specific tasks. */ diff --git a/modules/libcom/src/osi/epicsAssert.h b/modules/libcom/src/osi/epicsAssert.h index e51463048..7b524f7af 100644 --- a/modules/libcom/src/osi/epicsAssert.h +++ b/modules/libcom/src/osi/epicsAssert.h @@ -34,7 +34,7 @@ * * This header also provides a compile-time assertion macro STATIC_ASSERT() * which can be used to check a constant-expression at compile-time. The C or - * C++ compiler will flag an error if the expresstion evaluates to 0. The + * C++ compiler will flag an error if the expression evaluates to 0. The * STATIC_ASSERT() macro can only be used where a \c typedef is syntactically * legal. **/ diff --git a/modules/libcom/src/osi/epicsAtomicGCC.h b/modules/libcom/src/osi/epicsAtomicGCC.h index 006d6a27e..e08d04d7c 100644 --- a/modules/libcom/src/osi/epicsAtomicGCC.h +++ b/modules/libcom/src/osi/epicsAtomicGCC.h @@ -20,7 +20,7 @@ #ifndef INC_epicsAtomicGCC_H #define INC_epicsAtomicGCC_H -/* expands __GCC_HAVE_SYNC_COMPARE_AND_SWAP_ concatentating +/* expands __GCC_HAVE_SYNC_COMPARE_AND_SWAP_ concatenating * the numeric value __SIZEOF_*__ */ #define GCC_ATOMIC_CONCAT( A, B ) GCC_ATOMIC_CONCATR(A,B) diff --git a/modules/libcom/src/osi/epicsEvent.cpp b/modules/libcom/src/osi/epicsEvent.cpp index 1c05bba90..d8b2533eb 100644 --- a/modules/libcom/src/osi/epicsEvent.cpp +++ b/modules/libcom/src/osi/epicsEvent.cpp @@ -34,7 +34,7 @@ const char * epicsEvent::invalidSemaphore::what () const throw () // // Its probably preferable to not make these inline because they are in -// the sharable library interface. The use of inline or not here is probably +// the shareable library interface. The use of inline or not here is probably // not an issue because all of this ends up in the operating system in system // calls // diff --git a/modules/libcom/src/osi/epicsEvent.h b/modules/libcom/src/osi/epicsEvent.h index a5d1e79e4..8cc16fe61 100644 --- a/modules/libcom/src/osi/epicsEvent.h +++ b/modules/libcom/src/osi/epicsEvent.h @@ -13,7 +13,7 @@ * \brief APIs for the epicsEvent binary semaphore. * * Defines the C++ and C API's for a simple binary semaphore. If multiple threads are - * waiting on the same event, only one of them will be woken when the event is signalled. + * waiting on the same event, only one of them will be woken when the event is signaled. * * The primary use of an event semaphore is for thread synchronization. An example of using an * event semaphore is a consumer thread that processes requests from one or more producer threads. @@ -103,13 +103,13 @@ public: * \return True if the event was triggered, False if it timed out. **/ bool wait ( double timeOut ); - /**\brief Similar to wait() except that if the event is currenly empty the + /**\brief Similar to wait() except that if the event is currently empty the * call will return immediately. * \return True if the event was full (triggered), False if empty. **/ bool tryWait (); /**\brief Display information about the semaphore. - * \note The information displayed is architecture dependant. + * \note The information displayed is architecture dependent. * \param level An unsigned int for the level of information to be displayed. **/ void show ( unsigned level ) const; @@ -196,7 +196,7 @@ LIBCOM_API void epicsEventMustWait(epicsEventId id); LIBCOM_API epicsEventStatus epicsEventWaitWithTimeout( epicsEventId id, double timeOut); -/**\brief Similar to wait() except that if the event is currenly empty the +/**\brief Similar to wait() except that if the event is currently empty the * call will return immediately with status \c epicsEventWaitTimeout. * \param id The event identifier. * \return Status indicator, \c epicsEventWaitTimeout when the event is empty. @@ -205,7 +205,7 @@ LIBCOM_API epicsEventStatus epicsEventTryWait( epicsEventId id); /**\brief Display information about the semaphore. - * \note The information displayed is architecture dependant. + * \note The information displayed is architecture dependent. * \param id The event identifier. * \param level An unsigned int for the level of information to be displayed. **/ diff --git a/modules/libcom/src/osi/epicsGeneralTime.h b/modules/libcom/src/osi/epicsGeneralTime.h index 7e4a48d50..fe91475cf 100644 --- a/modules/libcom/src/osi/epicsGeneralTime.h +++ b/modules/libcom/src/osi/epicsGeneralTime.h @@ -56,7 +56,7 @@ extern "C" { **/ #define NUM_TIME_EVENTS 256 -/**\brief Initialise the framework. +/**\brief Initialize the framework. * * This routine is called automatically by any function that requires the * framework. It does not need to be called explicitly. diff --git a/modules/libcom/src/osi/epicsMath.cpp b/modules/libcom/src/osi/epicsMath.cpp index dc45bc1a1..7835420c6 100644 --- a/modules/libcom/src/osi/epicsMath.cpp +++ b/modules/libcom/src/osi/epicsMath.cpp @@ -1,5 +1,5 @@ /*************************************************************************\ -* Copyright (c) 2010 UChicago Argonna LLC, as Operator of Argonne +* Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * SPDX-License-Identifier: EPICS * EPICS BASE is distributed subject to a Software License Agreement found diff --git a/modules/libcom/src/osi/epicsMutex.h b/modules/libcom/src/osi/epicsMutex.h index fc47eda0c..41f73a4bc 100644 --- a/modules/libcom/src/osi/epicsMutex.h +++ b/modules/libcom/src/osi/epicsMutex.h @@ -27,7 +27,7 @@ epicsMutex::guard_t G(lock); // lock // process resources } // unlock - // or for compatiblity + // or for compatibility { epicsGuard G(lock); // lock // process resources @@ -99,7 +99,7 @@ public: /**\brief Display information about the semaphore. * - * \note Results are architecture dependant. + * \note Results are architecture dependent. * * \param level Desired information level to report **/ @@ -229,7 +229,7 @@ LIBCOM_API epicsMutexLockStatus epicsStdCall epicsMutexTryLock( /**\brief Display information about the semaphore. * - * \note Results are architecture dependant. + * \note Results are architecture dependent. * * \param id The mutex identifier. * \param level Desired information level to report @@ -239,7 +239,7 @@ LIBCOM_API void epicsStdCall epicsMutexShow( /**\brief Display information about all epicsMutex semaphores. * - * \note Results are architecture dependant. + * \note Results are architecture dependent. * * \param onlyLocked Non-zero to show only locked semaphores. * \param level Desired information level to report diff --git a/modules/libcom/src/osi/epicsStdio.h b/modules/libcom/src/osi/epicsStdio.h index 9bb5eb3e0..97afa3405 100644 --- a/modules/libcom/src/osi/epicsStdio.h +++ b/modules/libcom/src/osi/epicsStdio.h @@ -9,14 +9,14 @@ \*************************************************************************/ /** * \file epicsStdio.h - * \brief Standardize the behaviour of stdio across EPICS targets + * \brief Standardize the behavior of stdio across EPICS targets * * \details * The `epicsStdio.h` header includes the operating system's `stdio.h` header * and if used should replace it. * * epicsSnprintf() and epicsVsnprintf() have the same semantics as the C99 - * functions snprintf() and vsnprintf(), but correct the behaviour of the + * functions snprintf() and vsnprintf(), but correct the behavior of the * implementations on some operating systems. * * The routines epicsGetStdin(), epicsGetStdout(), epicsGetStderr(), diff --git a/modules/libcom/src/osi/epicsStdioRedirect.h b/modules/libcom/src/osi/epicsStdioRedirect.h index 88857cc72..8e116c8eb 100644 --- a/modules/libcom/src/osi/epicsStdioRedirect.h +++ b/modules/libcom/src/osi/epicsStdioRedirect.h @@ -10,7 +10,7 @@ /* epicsStdioRedirect.h */ -/* This file is now obselete, and is likely to be +/* This file is now obsolete, and is likely to be * deleted in a future release of EPICS Base. * * Use the epicsStdio.h header file instead. diff --git a/modules/libcom/src/osi/epicsThread.h b/modules/libcom/src/osi/epicsThread.h index a9ad476b3..c8035685b 100644 --- a/modules/libcom/src/osi/epicsThread.h +++ b/modules/libcom/src/osi/epicsThread.h @@ -15,7 +15,7 @@ * \brief C++ and C descriptions for a thread. * * The epicsThread API is meant as a somewhat minimal interface for - * multithreaded applications. It can be implementedon a wide variety of + * multithreaded applications. It can be implemented on a wide variety of * systems with the restriction that the system MUST support a * multithreaded environment. * A POSIX pthreads version is provided. diff --git a/modules/libcom/src/osi/epicsTime.cpp b/modules/libcom/src/osi/epicsTime.cpp index 90d4f9810..9d00acec2 100644 --- a/modules/libcom/src/osi/epicsTime.cpp +++ b/modules/libcom/src/osi/epicsTime.cpp @@ -206,7 +206,7 @@ size_t epicsStdCall epicsTimeToStrftime (char *pBuff, size_t bufLength, const ch bufLenLeft -= strftimeNumChar; } - // fractional seconds formating + // fractional seconds formatting if ( fracFmtFound && bufLenLeft > 1 ) { if ( fracWid > nSecFracDigits ) { fracWid = nSecFracDigits; @@ -296,7 +296,7 @@ int epicsStdCall epicsTimeToTime_t (time_t *pDest, const epicsTimeStamp *pSrc) { STATIC_ASSERT(sizeof(*pDest) >= sizeof(pSrc->secPastEpoch)); - // widen to 64-bit to (eventually) accomidate 64-bit time_t + // widen to 64-bit to (eventually) accommodate 64-bit time_t *pDest = epicsUInt64(pSrc->secPastEpoch) + POSIX_TIME_AT_EPICS_EPOCH; return epicsTimeOK; } diff --git a/modules/libcom/src/osi/epicsTime.h b/modules/libcom/src/osi/epicsTime.h index 8996c3733..05c02cf63 100644 --- a/modules/libcom/src/osi/epicsTime.h +++ b/modules/libcom/src/osi/epicsTime.h @@ -231,7 +231,7 @@ LIBCOM_API size_t epicsStdCall epicsTimeToStrftime ( LIBCOM_API void epicsStdCall epicsTimeShow ( const epicsTimeStamp *, unsigned interestLevel ); -/** \name Reentrant time_t to struct tm conversions +/** \name Re-entrant time_t to struct tm conversions * OS-specific reentrant versions of the ANSI C interface because the * vxWorks \c gmtime_r interface does not match POSIX standards * @{ */ @@ -480,7 +480,7 @@ public: * @{ */ /** \brief Convert to Windows struct _FILETIME */ operator struct _FILETIME () const; - /** \brief Constuct from Windows struct _FILETIME */ + /** \brief Construct from Windows struct _FILETIME */ epicsTime ( const struct _FILETIME & ); /** \brief Assign from Windows struct _FILETIME */ epicsTime & operator = ( const struct _FILETIME & ); diff --git a/modules/libcom/src/osi/os/Darwin/osdgetexec.c b/modules/libcom/src/osi/os/Darwin/osdgetexec.c index 688b4c94d..2f2d6e4d5 100644 --- a/modules/libcom/src/osi/os/Darwin/osdgetexec.c +++ b/modules/libcom/src/osi/os/Darwin/osdgetexec.c @@ -46,7 +46,7 @@ char *epicsGetExecDir(void) if(ret) { char *sep = strrchr(ret, '/'); if(sep) { - /* nil the charactor after the / */ + /* nil the character after the / */ sep[1] = '\0'; } } diff --git a/modules/libcom/src/osi/os/Linux/osdgetexec.c b/modules/libcom/src/osi/os/Linux/osdgetexec.c index 0c48e2f08..0045c43c3 100644 --- a/modules/libcom/src/osi/os/Linux/osdgetexec.c +++ b/modules/libcom/src/osi/os/Linux/osdgetexec.c @@ -54,7 +54,7 @@ char *epicsGetExecDir(void) if(ret) { char *sep = strrchr(ret, '/'); if(sep) { - /* nil the charactor after the / */ + /* nil the character after the / */ sep[1] = '\0'; } } diff --git a/modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c b/modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c index ed310eebc..a81d7169a 100644 --- a/modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c +++ b/modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c @@ -81,13 +81,13 @@ static long rtemsDevMapAddr (epicsAddressType addrType, unsigned options, /* * a bus error safe "wordSize" read at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long rtemsDevReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue); /* * a bus error safe "wordSize" write at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long rtemsDevWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue); @@ -306,7 +306,7 @@ rtems_status_code bspExtMemProbe(void *addr, int write, int size, void *pval) /* * a bus error safe "wordSize" read at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long rtemsDevReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue) { @@ -322,7 +322,7 @@ static long rtemsDevReadProbe (unsigned wordSize, volatile const void *ptr, void /* * a bus error safe "wordSize" write at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long rtemsDevWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue) { diff --git a/modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp b/modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp index 0195f7b4a..b17930d0e 100644 --- a/modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp +++ b/modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp @@ -11,7 +11,7 @@ #include "epicsSignal.h" /* - * All NOOPs if the os isnt POSIX + * All NOOPs if the os isn't POSIX */ LIBCOM_API void epicsStdCall epicsSignalInstallSigHupIgnore ( void ) {} LIBCOM_API void epicsStdCall epicsSignalInstallSigPipeIgnore ( void ) {} diff --git a/modules/libcom/src/osi/os/RTEMS-score/osdSpin.c b/modules/libcom/src/osi/os/RTEMS-score/osdSpin.c index 4f587f58a..63f8a5de3 100644 --- a/modules/libcom/src/osi/os/RTEMS-score/osdSpin.c +++ b/modules/libcom/src/osi/os/RTEMS-score/osdSpin.c @@ -16,7 +16,7 @@ * Andrew Johnson * Michael Davidsaver * - * Inspired by Linux UP spinlocks implemention + * Inspired by Linux UP spinlocks implementation * include/linux/spinlock_api_up.h */ diff --git a/modules/libcom/src/osi/os/RTEMS-score/osdThread.c b/modules/libcom/src/osi/os/RTEMS-score/osdThread.c index 71a532e62..c0f9ba0bd 100644 --- a/modules/libcom/src/osi/os/RTEMS-score/osdThread.c +++ b/modules/libcom/src/osi/os/RTEMS-score/osdThread.c @@ -386,7 +386,7 @@ void epicsThreadMustJoin(epicsThreadId id) errlogPrintf("Warning: %s thread self-join of unjoinable\n", v ? v->name : "non-EPICS thread"); } else { - /* try to error nicely, however in all likelyhood de-ref of + /* try to error nicely, however in all likelihood de-ref of * 'id' has already caused SIGSEGV as we are racing thread exit, * which free's 'id'. */ diff --git a/modules/libcom/src/osi/os/WIN32/epicsAtomicMS.h b/modules/libcom/src/osi/os/WIN32/epicsAtomicMS.h index a2004273a..f036ba6b6 100644 --- a/modules/libcom/src/osi/os/WIN32/epicsAtomicMS.h +++ b/modules/libcom/src/osi/os/WIN32/epicsAtomicMS.h @@ -49,7 +49,7 @@ EPICS_ATOMIC_INLINE int epicsAtomicAddIntT ( int * pTarget, int delta ) { STATIC_ASSERT ( sizeof ( MS_LONG ) == sizeof ( int ) ); MS_LONG * const pTarg = ( MS_LONG * ) ( pTarget ); - /* we dont use InterlockedAdd because only latest windows is supported */ + /* we don't use InterlockedAdd because only latest windows is supported */ return delta + ( int ) MS_InterlockedExchangeAdd ( pTarg, ( MS_LONG ) delta ); } @@ -101,7 +101,7 @@ EPICS_ATOMIC_INLINE size_t epicsAtomicAddSizeT ( size_t * pTarget, size_t delta ) { MS_LONG * const pTarg = ( MS_LONG * ) ( pTarget ); - /* we dont use InterlockedAdd because only latest windows is supported */ + /* we don't use InterlockedAdd because only latest windows is supported */ return delta + ( size_t ) MS_InterlockedExchangeAdd ( pTarg, ( MS_LONG ) delta ); } @@ -113,7 +113,7 @@ EPICS_ATOMIC_INLINE size_t epicsAtomicSubSizeT ( size_t * pTarget, size_t delta { MS_LONG * const pTarg = ( MS_LONG * ) ( pTarget ); MS_LONG ldelta = (MS_LONG) delta; - /* we dont use InterlockedAdd because only latest windows is supported */ + /* we don't use InterlockedAdd because only latest windows is supported */ return ( ( size_t ) MS_InterlockedExchangeAdd ( pTarg, -ldelta ) ) - delta; } #endif @@ -172,7 +172,7 @@ EPICS_ATOMIC_INLINE size_t epicsAtomicDecrSizeT ( size_t * pTarget ) EPICS_ATOMIC_INLINE size_t epicsAtomicAddSizeT ( size_t * pTarget, size_t delta ) { MS_LONGLONG * const pTarg = ( MS_LONGLONG * ) ( pTarget ); - /* we dont use InterlockedAdd64 because only latest windows is supported */ + /* we don't use InterlockedAdd64 because only latest windows is supported */ return delta + ( size_t ) MS_InterlockedExchangeAdd64 ( pTarg, ( MS_LONGLONG ) delta ); } @@ -184,7 +184,7 @@ EPICS_ATOMIC_INLINE size_t epicsAtomicSubSizeT ( size_t * pTarget, size_t delta { MS_LONGLONG * const pTarg = ( MS_LONGLONG * ) ( pTarget ); MS_LONGLONG ldelta = (MS_LONGLONG) delta; - /* we dont use InterlockedAdd64 because only latest windows is supported */ + /* we don't use InterlockedAdd64 because only latest windows is supported */ return (( size_t ) MS_InterlockedExchangeAdd64 ( pTarg, -ldelta )) - delta; } #endif diff --git a/modules/libcom/src/osi/os/WIN32/epicsTempFile.c b/modules/libcom/src/osi/os/WIN32/epicsTempFile.c index 106a5cdba..1a01477ea 100644 --- a/modules/libcom/src/osi/os/WIN32/epicsTempFile.c +++ b/modules/libcom/src/osi/os/WIN32/epicsTempFile.c @@ -23,8 +23,8 @@ /* * epicsTmpFile * - * allow the teporary file directory to be set with the - * TMP environment varianble + * allow the temporary file directory to be set with the + * TMP environment variable */ LIBCOM_API FILE * epicsStdCall epicsTempFile () { diff --git a/modules/libcom/src/osi/os/WIN32/forceBadAllocException.cpp b/modules/libcom/src/osi/os/WIN32/forceBadAllocException.cpp index f26998d2b..446092d6c 100644 --- a/modules/libcom/src/osi/os/WIN32/forceBadAllocException.cpp +++ b/modules/libcom/src/osi/os/WIN32/forceBadAllocException.cpp @@ -19,7 +19,7 @@ #include #include -// instruct loader to call this gllobal object +// instruct loader to call this global object // constructor before user global object constructors #pragma warning (disable: 4073) #pragma init_seg(lib) diff --git a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c index cff18d0e6..6a9b722c0 100644 --- a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c +++ b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c @@ -16,7 +16,7 @@ static epicsUInt64 osdMonotonicResolution; /* timer resolution in nanoseconds */ static epicsUInt64 perfCounterFrequency; /* performance counter tics per second */ -static LONGLONG perfCounterOffset; /* performance counter value at initialisation */ +static LONGLONG perfCounterOffset; /* performance counter value at initialization */ static const epicsUInt64 sec2nsec = 1000000000; /* number of nanoseconds in a second */ void osdMonotonicInit(void) diff --git a/modules/libcom/src/osi/os/WIN32/osdMutex.c b/modules/libcom/src/osi/os/WIN32/osdMutex.c index 405a9c741..561093cac 100644 --- a/modules/libcom/src/osi/os/WIN32/osdMutex.c +++ b/modules/libcom/src/osi/os/WIN32/osdMutex.c @@ -31,7 +31,7 @@ * are used. The code does have run time switches so * that the more advanced calls are not called unless * they are available in the windows OS, but this feature - * isnt going to be very useful unless we specify "delay + * isn't going to be very useful unless we specify "delay * loading" when we link with the DLL. * * It appears that the only entry point used here that causes diff --git a/modules/libcom/src/osi/os/WIN32/osdNetIntf.c b/modules/libcom/src/osi/os/WIN32/osdNetIntf.c index d20e987c0..5b3565ad0 100644 --- a/modules/libcom/src/osi/os/WIN32/osdNetIntf.c +++ b/modules/libcom/src/osi/os/WIN32/osdNetIntf.c @@ -9,7 +9,7 @@ \*************************************************************************/ /* - * WIN32 specific initialisation for bsd sockets, + * WIN32 specific initialization for bsd sockets, * based on Chris Timossi's base/src/ca/windows_depend.c, * and also further additions by Kay Kasemir when this was in * dllmain.cc @@ -85,14 +85,14 @@ static void osiLocalAddrOnce ( void *raw ) for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){ /* - * dont use interfaces that have been disabled + * don't use interfaces that have been disabled */ if (!(pIfinfo->iiFlags & IFF_UP)) { continue; } /* - * dont use the loop back interface + * don't use the loop back interface */ if (pIfinfo->iiFlags & IFF_LOOPBACK) { continue; @@ -183,7 +183,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){ /* - * dont bother with interfaces that have been disabled + * don't bother with interfaces that have been disabled */ if (!(pIfinfo->iiFlags & IFF_UP)) { continue; @@ -203,7 +203,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * if it isnt a wildcarded interface then look for + * if it isn't a wildcarded interface then look for * an exact match */ if (pMatchAddr->sa.sa_family != AF_UNSPEC) { diff --git a/modules/libcom/src/osi/os/WIN32/osdProcess.c b/modules/libcom/src/osi/os/WIN32/osdProcess.c index cff1ed4bd..a41105d45 100644 --- a/modules/libcom/src/osi/os/WIN32/osdProcess.c +++ b/modules/libcom/src/osi/os/WIN32/osdProcess.c @@ -71,7 +71,7 @@ LIBCOM_API osiSpawnDetachedProcessReturn epicsStdCall osiSpawnDetachedProcess NULL, /* pointer to thread security attributes */ FALSE, /* handle inheritance flag */ CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, /* creation flags */ - NULL, /* pointer to new environment block (defaults to caller's environement) */ + NULL, /* pointer to new environment block (defaults to caller's environment) */ NULL, /* pointer to current directory name (defaults to caller's current directory) */ &startupInfo, /* pointer to STARTUPINFO */ &processInfo /* pointer to PROCESS_INFORMATION */ diff --git a/modules/libcom/src/osi/os/WIN32/osdSock.c b/modules/libcom/src/osi/os/WIN32/osdSock.c index 6b7d6c8b8..8ca80ffb9 100644 --- a/modules/libcom/src/osi/os/WIN32/osdSock.c +++ b/modules/libcom/src/osi/os/WIN32/osdSock.c @@ -9,7 +9,7 @@ \*************************************************************************/ /* - * WIN32 specific initialisation for bsd sockets, + * WIN32 specific initialization for bsd sockets, * based on Chris Timossi's base/src/ca/windows_depend.c, * and also further additions by Kay Kasemir when this was in * dllmain.cc diff --git a/modules/libcom/src/osi/os/WIN32/osdSock.h b/modules/libcom/src/osi/os/WIN32/osdSock.h index 9eab6e76a..4f35ab56e 100644 --- a/modules/libcom/src/osi/os/WIN32/osdSock.h +++ b/modules/libcom/src/osi/os/WIN32/osdSock.h @@ -16,7 +16,7 @@ /* * winsock2.h changes the structure alignment to 4 if - * WIN32 isnt set which can be a source of confusion + * WIN32 isn't set which can be a source of confusion */ #ifndef WIN32 # define WIN32 @@ -72,7 +72,7 @@ typedef DWORD osiSockOptMcastTTL_t; * Under WIN32, FD_SETSIZE is the max. number of sockets, * not the max. fd value that you use in select(). * - * Therefore, it is difficult to detemine if any given + * Therefore, it is difficult to determine if any given * fd can be used with FD_SET(), FD_CLR(), and FD_ISSET(). */ #define FD_IN_FDSET(FD) (1) diff --git a/modules/libcom/src/osi/os/WIN32/osdThread.c b/modules/libcom/src/osi/os/WIN32/osdThread.c index cff3e45d4..b001775d9 100644 --- a/modules/libcom/src/osi/os/WIN32/osdThread.c +++ b/modules/libcom/src/osi/os/WIN32/osdThread.c @@ -116,13 +116,13 @@ BOOL WINAPI DllMain ( case DLL_THREAD_ATTACH: /* - * Dont allow user's explicitly calling FreeLibrary for Com.dll to yank + * Don't allow user's explicitly calling FreeLibrary for Com.dll to yank * the carpet out from under EPICS threads that are still using Com.dll */ #if _WIN32_WINNT >= 0x0501 /* * Only in WXP - * Thats a shame because this is probably much faster + * That's a shame because this is probably much faster */ success = GetModuleHandleEx ( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, @@ -653,7 +653,7 @@ void epicsThreadMustJoin(epicsThreadId id) fprintf(stderr, "Warning: %s thread self-join of unjoinable\n", pParmWIN32->pName); } else { - /* try to error nicely, however in all likelyhood de-ref of + /* try to error nicely, however in all likelihood de-ref of * 'id' has already caused SIGSEGV as we are racing thread exit, * which free's 'id'. */ diff --git a/modules/libcom/src/osi/os/WIN32/osdgetexec.c b/modules/libcom/src/osi/os/WIN32/osdgetexec.c index ad458e80f..d54f42958 100644 --- a/modules/libcom/src/osi/os/WIN32/osdgetexec.c +++ b/modules/libcom/src/osi/os/WIN32/osdgetexec.c @@ -48,7 +48,7 @@ char *epicsGetExecDir(void) if(ret) { char *sep = strrchr(ret, '\\'); if(sep) { - /* nil the charactor after the / */ + /* nil the character after the / */ sep[1] = '\0'; } } diff --git a/modules/libcom/src/osi/os/cygwin32/systemCallIntMech.cpp b/modules/libcom/src/osi/os/cygwin32/systemCallIntMech.cpp index 291fb5890..a6ce793a1 100644 --- a/modules/libcom/src/osi/os/cygwin32/systemCallIntMech.cpp +++ b/modules/libcom/src/osi/os/cygwin32/systemCallIntMech.cpp @@ -19,7 +19,7 @@ enum epicsSocketSystemCallInterruptMechanismQueryInfo epicsSocketSystemCallInterruptMechanismQuery () { #if (CYGWIN_VERSION_DLL_MAJOR == 1007) && (CYGWIN_VERSION_DLL_MINOR < 15) - // Behaviour changed in early Cygwin 1.7 releases, reverted later. + // Behavior changed in early Cygwin 1.7 releases, reverted later. return esscimqi_socketCloseRequired; #else return esscimqi_socketBothShutdownRequired; diff --git a/modules/libcom/src/osi/os/default/osdSignal.cpp b/modules/libcom/src/osi/os/default/osdSignal.cpp index 0195f7b4a..b17930d0e 100644 --- a/modules/libcom/src/osi/os/default/osdSignal.cpp +++ b/modules/libcom/src/osi/os/default/osdSignal.cpp @@ -11,7 +11,7 @@ #include "epicsSignal.h" /* - * All NOOPs if the os isnt POSIX + * All NOOPs if the os isn't POSIX */ LIBCOM_API void epicsStdCall epicsSignalInstallSigHupIgnore ( void ) {} LIBCOM_API void epicsStdCall epicsSignalInstallSigPipeIgnore ( void ) {} diff --git a/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp b/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp index bf4c1e4c0..b2d3906bc 100644 --- a/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp +++ b/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp @@ -28,7 +28,7 @@ LIBCOM_API void epicsStdCall * SO_REUSEADDR compared to other OS. With WINSOCK SO_REUSEADDR indicates * that simultaneously servers can bind to the same TCP port on the same host! * Also, servers are always enabled to reuse a port immediately after - * they exit ( even if SO_REUSEADDR isnt set ). + * they exit ( even if SO_REUSEADDR isn't set ). */ #else int yes = true; diff --git a/modules/libcom/src/osi/os/freebsd/osdgetexec.c b/modules/libcom/src/osi/os/freebsd/osdgetexec.c index 70b0f0a56..1db5cbc94 100644 --- a/modules/libcom/src/osi/os/freebsd/osdgetexec.c +++ b/modules/libcom/src/osi/os/freebsd/osdgetexec.c @@ -66,7 +66,7 @@ char *epicsGetExecDir(void) if(ret) { char *sep = strrchr(ret, '/'); if(sep) { - /* nil the charactor after the / */ + /* nil the character after the / */ sep[1] = '\0'; } } diff --git a/modules/libcom/src/osi/os/posix/osdThread.c b/modules/libcom/src/osi/os/posix/osdThread.c index 80c53e3e6..3cba2fa67 100644 --- a/modules/libcom/src/osi/os/posix/osdThread.c +++ b/modules/libcom/src/osi/os/posix/osdThread.c @@ -272,7 +272,7 @@ int low, try; * at all. However, we still must return * a priority range accepted by the SCHED_FIFO * policy. Otherwise, epicsThreadCreate() cannot - * detect the unsufficient permission (EPERM) + * detect the insufficient permission (EPERM) * and fall back to a non-RT thread (because * pthread_attr_setschedparam would fail with * EINVAL due to the bad priority). @@ -651,7 +651,7 @@ void epicsThreadMustJoin(epicsThreadId id) errlogPrintf("Warning: %s thread self-join of unjoinable\n", id->name); } else { - /* try to error nicely, however in all likelyhood de-ref of + /* try to error nicely, however in all likelihood de-ref of * 'id' has already caused SIGSEGV as we are racing thread exit, * which free's 'id'. */ diff --git a/modules/libcom/src/osi/os/solaris/osdgetexec.c b/modules/libcom/src/osi/os/solaris/osdgetexec.c index 748e35ddd..8685e8b46 100644 --- a/modules/libcom/src/osi/os/solaris/osdgetexec.c +++ b/modules/libcom/src/osi/os/solaris/osdgetexec.c @@ -26,7 +26,7 @@ char *epicsGetExecDir(void) if(ret) { char *sep = strrchr(ret, '/'); if(sep) { - /* nil the charactor after the / */ + /* nil the character after the / */ sep[1] = '\0'; } } diff --git a/modules/libcom/src/osi/os/vxWorks/devLibVMEOSD.c b/modules/libcom/src/osi/os/vxWorks/devLibVMEOSD.c index 1d80f23f6..b2fbbdf9a 100644 --- a/modules/libcom/src/osi/os/vxWorks/devLibVMEOSD.c +++ b/modules/libcom/src/osi/os/vxWorks/devLibVMEOSD.c @@ -8,7 +8,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * Archictecture dependent support for common device driver resources + * Architecture dependent support for common device driver resources * * Author: Jeff Hill * Date: 10-30-98 @@ -99,13 +99,13 @@ static long vxDevMapAddr (epicsAddressType addrType, unsigned options, /* * a bus error safe "wordSize" read at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long vxDevReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue); /* * a bus error safe "wordSize" write at the specified address which returns - * unsuccessful status if the device isnt present + * unsuccessful status if the device isn't present */ static long vxDevWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue); diff --git a/modules/libcom/src/osi/os/vxWorks/epicsAtomicOSD.h b/modules/libcom/src/osi/os/vxWorks/epicsAtomicOSD.h index bdf48870a..53f69de9f 100644 --- a/modules/libcom/src/osi/os/vxWorks/epicsAtomicOSD.h +++ b/modules/libcom/src/osi/os/vxWorks/epicsAtomicOSD.h @@ -154,11 +154,11 @@ EPICS_ATOMIC_INLINE size_t epicsAtomicSubSizeT ( size_t * pTarget, size_t delta /* * if its 64 bit SMP vxWorks and the compiler doesnt - * have an intrinsic then maybe there isnt any way to + * have an intrinsic then maybe there isn't any way to * implement these without using a global lock because * size_t is maybe bigger than atomic_t * - * I dont yet have access to vxWorks manuals for + * I don't yet have access to vxWorks manuals for * 64 bit systems so this is still undecided, but is * defaulting now to a global lock */ @@ -216,7 +216,7 @@ extern "C" { #ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER #define EPICS_ATOMIC_READ_MEMORY_BARRIER /* - * no need for memory barrior since prior to vxWorks 6.6 it is a single cpu system + * no need for memory barrier since prior to vxWorks 6.6 it is a single cpu system * (we are not protecting against multiple access to memory mapped IO) */ EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier (void) {} @@ -225,7 +225,7 @@ EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier (void) {} #ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER #define EPICS_ATOMIC_WRITE_MEMORY_BARRIER /* - * no need for memory barrior since prior to vxWorks 6.6 it is a single cpu system + * no need for memory barrier since prior to vxWorks 6.6 it is a single cpu system * (we are not protecting against multiple access to memory mapped IO) */ EPICS_ATOMIC_INLINE void epicsAtomicWriteMemoryBarrier (void) {} diff --git a/modules/libcom/src/osi/os/vxWorks/osdPoolStatus.c b/modules/libcom/src/osi/os/vxWorks/osdPoolStatus.c index 3b2648d57..8c4618af8 100644 --- a/modules/libcom/src/osi/os/vxWorks/osdPoolStatus.c +++ b/modules/libcom/src/osi/os/vxWorks/osdPoolStatus.c @@ -16,8 +16,8 @@ /* * It turns out that memPartInfoGet() and memFindMax() are very CPU intensive on vxWorks - * so we must spawn off a thread that periodically polls. Although this isnt 100% safe, I - * dont see what else to do. + * so we must spawn off a thread that periodically polls. Although this isn't 100% safe, I + * don't see what else to do. * * It takes about 30 uS to call memPartInfoGet() on a pcPentium I vxWorks system. * diff --git a/modules/libcom/src/osi/os/vxWorks/osdSpin.c b/modules/libcom/src/osi/os/vxWorks/osdSpin.c index 9d1882eec..afbfda455 100644 --- a/modules/libcom/src/osi/os/vxWorks/osdSpin.c +++ b/modules/libcom/src/osi/os/vxWorks/osdSpin.c @@ -16,7 +16,7 @@ * Andrew Johnson * Michael Davidsaver * - * Inspired by Linux UP spinlocks implemention + * Inspired by Linux UP spinlocks implementation * include/linux/spinlock_api_up.h */ diff --git a/modules/libcom/src/osi/os/vxWorks/task_params.h b/modules/libcom/src/osi/os/vxWorks/task_params.h index a3b1b469a..d57cbdd59 100644 --- a/modules/libcom/src/osi/os/vxWorks/task_params.h +++ b/modules/libcom/src/osi/os/vxWorks/task_params.h @@ -55,9 +55,9 @@ /* Task priorities */ #define SCANONCE_PRI 129 /* scan one time */ /*DO NOT RUN ANY RECORD PROCESSING TASKS AT HIGHER PRIORITY THAN _netTask=50*/ -#define CALLBACK_PRI_LOW 140 /* callback task - generall callback task */ -#define CALLBACK_PRI_MEDIUM 135 /* callback task - generall callback task */ -#define CALLBACK_PRI_HIGH 128 /* callback task - generall callback task */ +#define CALLBACK_PRI_LOW 140 /* callback task - general callback task */ +#define CALLBACK_PRI_MEDIUM 135 /* callback task - general callback task */ +#define CALLBACK_PRI_HIGH 128 /* callback task - general callback task */ #define EVENTSCAN_PRI 129 /* Event Scanner - Runs on a global event */ #define SMCMD_PRI 120 /* Stepper Motor Command Task - Waits for cmds */ #define SMRESP_PRI 121 /* Stepper Motor Resp Task - Waits for resps */ diff --git a/modules/libcom/src/osi/os/vxWorks/veclist.c b/modules/libcom/src/osi/os/vxWorks/veclist.c index 1a4c4ad35..949606936 100644 --- a/modules/libcom/src/osi/os/vxWorks/veclist.c +++ b/modules/libcom/src/osi/os/vxWorks/veclist.c @@ -8,7 +8,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * list fuctions attached to the interrupt vector table + * list functions attached to the interrupt vector table * * Created 28Mar89 Jeffrey O. Hill * johill@lanl.gov diff --git a/modules/libcom/src/osi/osdNetIfAddrs.c b/modules/libcom/src/osi/osdNetIfAddrs.c index 97be89b36..293d9ef85 100644 --- a/modules/libcom/src/osi/osdNetIfAddrs.c +++ b/modules/libcom/src/osi/osdNetIfAddrs.c @@ -70,7 +70,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses ifa->ifa_name)); /* - * If its not an internet interface then dont use it + * If its not an internet interface then don't use it */ if ( ifa->ifa_addr->sa_family != AF_INET ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): interface \"%s\" was not AF_INET\n", ifa->ifa_name) ); @@ -78,7 +78,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * if it isnt a wildcarded interface then look for + * if it isn't a wildcarded interface then look for * an exact match */ if ( pMatchAddr->sa.sa_family != AF_UNSPEC ) { @@ -95,7 +95,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * dont bother with interfaces that have been disabled + * don't bother with interfaces that have been disabled */ if ( ! ( ifa->ifa_flags & IFF_UP ) ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" was down\n", ifa->ifa_name) ); @@ -103,7 +103,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * dont use the loop back interface + * don't use the loop back interface */ if ( ifa->ifa_flags & IFF_LOOPBACK ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): ignoring loopback interface: \"%s\"\n", ifa->ifa_name) ); @@ -189,7 +189,7 @@ static void osiLocalAddrOnce (void *raw) } /* - * dont use the loop back interface + * don't use the loop back interface */ if ( ifa->ifa_flags & IFF_LOOPBACK ) { ifDepenDebugPrintf ( ("osiLocalAddrOnce(): ignoring loopback interface: %s\n", ifa->ifa_name) ); diff --git a/modules/libcom/src/osi/osdNetIfConf.c b/modules/libcom/src/osi/osdNetIfConf.c index 47339020f..029ed385e 100644 --- a/modules/libcom/src/osi/osdNetIfConf.c +++ b/modules/libcom/src/osi/osdNetIfConf.c @@ -135,7 +135,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses (unsigned)current_ifreqsize)); /* - * If its not an internet interface then dont use it + * If its not an internet interface then don't use it */ if ( pIfreqList->ifr_addr.sa_family != AF_INET ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): interface \"%s\" was not AF_INET\n", pIfreqList->ifr_name) ); @@ -143,7 +143,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * if it isnt a wildcarded interface then look for + * if it isn't a wildcarded interface then look for * an exact match */ if ( pMatchAddr->sa.sa_family != AF_UNSPEC ) { @@ -167,7 +167,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" flags: %x\n", pIfreqList->ifr_name, pIfreqList->ifr_flags) ); /* - * dont bother with interfaces that have been disabled + * don't bother with interfaces that have been disabled */ if ( ! ( pIfreqList->ifr_flags & IFF_UP ) ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" was down\n", pIfreqList->ifr_name) ); @@ -175,7 +175,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses } /* - * dont use the loop back interface + * don't use the loop back interface */ if ( pIfreqList->ifr_flags & IFF_LOOPBACK ) { ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): ignoring loopback interface: \"%s\"\n", pIfreqList->ifr_name) ); @@ -318,7 +318,7 @@ static void osiLocalAddrOnce (void *raw) } /* - * dont use the loop back interface + * don't use the loop back interface */ if ( pIfreqList->ifr_flags & IFF_LOOPBACK ) { ifDepenDebugPrintf ( ("osiLocalAddr(): ignoring loopback interface: %s\n", pIfreqList->ifr_name) ); diff --git a/modules/libcom/src/osi/osiNTPTime.c b/modules/libcom/src/osi/osiNTPTime.c index bd9821e4c..f896d7bf7 100644 --- a/modules/libcom/src/osi/osiNTPTime.c +++ b/modules/libcom/src/osi/osiNTPTime.c @@ -194,7 +194,7 @@ static void NTPTimeSync(void *dummy) diff = epicsTimeDiffInSeconds(&timeNow, &NTPTimePvt.clockTime); if (diff >= 0.0) { NTPTimePvt.ticksToSkip = 0; - } else { /* dont go back in time */ + } else { /* don't go back in time */ NTPTimePvt.ticksToSkip = -diff * osdTickRateGet(); } NTPTimePvt.clockTick = tickNow; diff --git a/modules/libcom/src/osi/osiPoolStatus.h b/modules/libcom/src/osi/osiPoolStatus.h index 28dba4f10..1668f54cd 100644 --- a/modules/libcom/src/osi/osiPoolStatus.h +++ b/modules/libcom/src/osi/osiPoolStatus.h @@ -30,7 +30,7 @@ extern "C" { * space is usually necessary to keep the system running reliably. * On vxWorks this returns True if at least 100000 bytes is free. * - * \note This routine is called quite frequently by the IOC so an efficent + * \note This routine is called quite frequently by the IOC so an efficient * implementation is important. * * \param contiguousBlockSize Block size to check. diff --git a/modules/libcom/src/osi/osiSock.c b/modules/libcom/src/osi/osiSock.c index 03387ec61..e92103aca 100644 --- a/modules/libcom/src/osi/osiSock.c +++ b/modules/libcom/src/osi/osiSock.c @@ -161,7 +161,7 @@ unsigned epicsStdCall ipAddrToDottedIP ( } /* - * inet_ntoa() isnt used because it isnt thread safe + * inet_ntoa() isn't used because it isn't thread safe * (and the replacements are not standardized) */ status = epicsSnprintf ( diff --git a/modules/libcom/src/osi/osiSock.h b/modules/libcom/src/osi/osiSock.h index 83021257a..98eb2c140 100644 --- a/modules/libcom/src/osi/osiSock.h +++ b/modules/libcom/src/osi/osiSock.h @@ -71,7 +71,7 @@ LIBCOM_API int epicsSocketUnsentCount(SOCKET sock); * * returns the number of character elements stored in buffer not * including the null termination, but always writes at least a - * null ternminater in the string (if bufSize >= 1) + * null terminator in the string (if bufSize >= 1) */ LIBCOM_API unsigned epicsStdCall sockAddrToA ( const struct sockaddr * paddr, char * pBuf, unsigned bufSize ); @@ -83,7 +83,7 @@ LIBCOM_API unsigned epicsStdCall sockAddrToA ( * * returns the number of character elements stored in buffer not * including the null termination, but always writes at least a - * null ternminater in the string (if bufSize >= 1) + * null terminator in the string (if bufSize >= 1) */ LIBCOM_API unsigned epicsStdCall ipAddrToA ( const struct sockaddr_in * pInetAddr, char * pBuf, unsigned bufSize ); @@ -94,7 +94,7 @@ LIBCOM_API unsigned epicsStdCall ipAddrToA ( * * returns the number of character elements stored in buffer not * including the null termination, but always writes at least a - * null ternminater in the string (if bufSize >= 1) + * null terminator in the string (if bufSize >= 1) */ LIBCOM_API unsigned epicsStdCall sockAddrToDottedIP ( const struct sockaddr * paddr, char * pBuf, unsigned bufSize ); @@ -105,7 +105,7 @@ LIBCOM_API unsigned epicsStdCall sockAddrToDottedIP ( * * returns the number of character elements stored in buffer not * including the null termination, but always writes at least a - * null ternminater in the string (if bufSize >= 1) + * null terminator in the string (if bufSize >= 1) */ LIBCOM_API unsigned epicsStdCall ipAddrToDottedIP ( const struct sockaddr_in * paddr, char * pBuf, unsigned bufSize ); @@ -179,7 +179,7 @@ LIBCOM_API int epicsStdCall sockAddrAreIdentical * a destination port number, and a match address. When the * routine returns there will be one additional entry * (an osiSockAddrNode) in the list for each network interface found that - * is up and isnt a loop back interface (match addr is INADDR_ANY), + * is up and isn't a loop back interface (match addr is INADDR_ANY), * or only the interfaces that match the specified addresses (match addr * is other than INADDR_ANY). If the interface supports broadcasting * then add its broadcast address to the list. If the interface is a @@ -203,7 +203,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses * repeater would not always allow the loopback address * as a local client address so current clients alternate * between the address of the first non-loopback interface - * found and the loopback addresss when subscribing with + * found and the loopback address when subscribing with * the CA repeater until all CA repeaters have been updated * to current code. After all CA repeaters have been restarted * this osi interface can be eliminated. diff --git a/modules/libcom/src/osi/osiWireFormat.h b/modules/libcom/src/osi/osiWireFormat.h index 49059405c..b268b8e3e 100644 --- a/modules/libcom/src/osi/osiWireFormat.h +++ b/modules/libcom/src/osi/osiWireFormat.h @@ -22,7 +22,7 @@ // With future CA protocols user defined payload composition will be // supported and we will need to move away from a naturally aligned // protocol (because pad byte overhead will probably be excessive when -// maintaining 8 byte natural alignment if the user isnt thinking about +// maintaining 8 byte natural alignment if the user isn't thinking about // placing like sized elements together). // // Nevertheless, the R3.14 protocol continues to be naturally aligned, @@ -152,7 +152,7 @@ union WireAlias < epicsFloat32 > { // // Missaligned unsigned wire format get/set can be implemented generically // w/o performance penalty. Attempts to improve this on architectures that -// dont have alignement requirements will probably get into trouble with +// don't have alignment requirements will probably get into trouble with // over-aggressive optimization under strict aliasing rules. // diff --git a/modules/libcom/src/timer/timer.cpp b/modules/libcom/src/timer/timer.cpp index 5953a36f6..458a68e4f 100644 --- a/modules/libcom/src/timer/timer.cpp +++ b/modules/libcom/src/timer/timer.cpp @@ -152,7 +152,7 @@ void timer::cancel () this->curState = timer::stateLimbo; if ( this->queue.processThread != epicsThreadGetIdSelf() ) { // make certain timer expire() does not run after cancel () returns, - // but dont require that lock is applied while calling expire() + // but don't require that lock is applied while calling expire() while ( this->queue.cancelPending && this->queue.pExpireTmr == this ) { epicsGuardRelease < epicsMutex > autoRelease ( locker ); @@ -174,7 +174,7 @@ void timer::cancel () epicsTimer::expireInfo timer::getExpireInfo () const { // taking a lock here guarantees that users will not - // see brief intervals when a timer isnt active because + // see brief intervals when a timer isn't active because // it is is canceled when start is called epicsGuard < epicsMutex > locker ( this->queue.mutex ); if ( this->curState == statePending || this->curState == stateActive ) { diff --git a/modules/libcom/src/timer/timerPrivate.h b/modules/libcom/src/timer/timerPrivate.h index 796f0e609..a1f199def 100644 --- a/modules/libcom/src/timer/timerPrivate.h +++ b/modules/libcom/src/timer/timerPrivate.h @@ -48,7 +48,7 @@ protected: timerQueue & queue; private: enum state { statePending = 45, stateActive = 56, stateLimbo = 78 }; - epicsTime exp; // experation time + epicsTime exp; // expiration time state curState; // current state epicsTimerNotify * pNotify; // callback void privateStart ( epicsTimerNotify & notify, const epicsTime & ); diff --git a/modules/libcom/src/timer/timerQueue.cpp b/modules/libcom/src/timer/timerQueue.cpp index db585dfb9..76632d8fd 100644 --- a/modules/libcom/src/timer/timerQueue.cpp +++ b/modules/libcom/src/timer/timerQueue.cpp @@ -62,7 +62,7 @@ void timerQueue :: strcpy ( date, "UKN DATE" ); } if ( delay >= exceptMsgMinPeriod ) { - // we dont touch the typeid for the timer expiration + // we don't touch the typeid for the timer expiration // notify interface here because they might have // destroyed the timer during its callback errlogPrintf ( @@ -97,7 +97,7 @@ double timerQueue::process ( const epicsTime & currentTime ) } // - // Tag current epired tmr so that we can detect if call back + // Tag current expired tmr so that we can detect if call back // is in progress when canceling the timer. // if ( this->timerList.first () ) { @@ -155,7 +155,7 @@ double timerQueue::process ( const epicsTime & currentTime ) // 1) if another thread is canceling then cancel() waits for // the event below // 2) if this thread is canceling in the timer callback then - // dont touch timer or notify here because the cancel might + // don't touch timer or notify here because the cancel might // have occurred because they destroyed the timer in the // callback this->cancelPending = false; diff --git a/modules/libcom/src/valgrind/valgrind.h b/modules/libcom/src/valgrind/valgrind.h index 2f0957c0f..16e250060 100644 --- a/modules/libcom/src/valgrind/valgrind.h +++ b/modules/libcom/src/valgrind/valgrind.h @@ -1065,7 +1065,7 @@ typedef /* Use these to write the name of your wrapper. NOTE: duplicates VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. NOTE also: inserts - the default behaviour equivalance class tag "0000" into the name. + the default behavior equivalence class tag "0000" into the name. See pub_tool_redir.h for details -- normally you don't need to think about this, though. */ @@ -1142,7 +1142,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ #define VALGRIND_ALIGN_STACK \ @@ -1646,7 +1646,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ #define VALGRIND_ALIGN_STACK \ @@ -1661,8 +1661,8 @@ typedef /* NB 9 Sept 07. There is a nasty kludge here in all these CALL_FN_ macros. In order not to trash the stack redzone, we need to drop %rsp by 128 before the hidden call, and restore afterwards. The - nastyness is that it is only by luck that the stack still appears - to be unwindable during the hidden call - since then the behaviour + nastiness is that it is only by luck that the stack still appears + to be unwindable during the hidden call - since then the behavior of any routine using this macro does not match what the CFI data says. Sigh. @@ -2152,7 +2152,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ #define VALGRIND_ALIGN_STACK \ @@ -2631,7 +2631,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ #define VALGRIND_ALIGN_STACK \ @@ -3187,7 +3187,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ #define VALGRIND_ALIGN_STACK \ @@ -3738,7 +3738,7 @@ typedef /* Macros to save and align the stack before making a function call and restore it afterwards as gcc may not keep the stack - pointer aligned if it doesn't realise calls are being made + pointer aligned if it doesn't realize calls are being made to other functions. */ /* This is a bit tricky. We store the original stack pointer in r10 @@ -6177,7 +6177,7 @@ typedef Other values are not allowed. */ VG_USERREQ__CHANGE_ERR_DISABLEMENT = 0x1801, - /* Initialise IR injection */ + /* Initialize IR injection */ VG_USERREQ__VEX_INIT_FOR_IRI = 0x1901 } Vg_ClientRequest; @@ -6290,7 +6290,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) /* These requests allow control to move from the simulated CPU to the - real CPU, calling an arbitary function. + real CPU, calling an arbitrary function. Note that the current ThreadId is inserted as the first argument. So this call: @@ -6564,7 +6564,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) If a connection is opened with GDB, the output will be sent according to the output mode set for vgdb. If no connection is opened, output will go to the log output. - Returns 1 if command not recognised, 0 otherwise. */ + Returns 1 if command not recognized, 0 otherwise. */ #define VALGRIND_MONITOR_COMMAND(command) \ VALGRIND_DO_CLIENT_REQUEST_EXPR(0, VG_USERREQ__GDB_MONITOR_COMMAND, \ command, 0, 0, 0, 0) diff --git a/modules/libcom/src/yacc/reader.c b/modules/libcom/src/yacc/reader.c index ff87bea7e..dc0070e65 100644 --- a/modules/libcom/src/yacc/reader.c +++ b/modules/libcom/src/yacc/reader.c @@ -3,7 +3,7 @@ /* The line size must be a positive integer. One hundred was chosen */ /* because few lines in Yacc input grammars exceed 100 characters. */ /* Note that if a line exceeds LINESIZE characters, the line buffer */ -/* will be expanded to accomodate it. */ +/* will be expanded to accommodate it. */ #define LINESIZE 100 diff --git a/modules/libcom/src/yajl/yajl_buf.h b/modules/libcom/src/yajl/yajl_buf.h index f0f6fa02d..40a6fbd57 100644 --- a/modules/libcom/src/yajl/yajl_buf.h +++ b/modules/libcom/src/yajl/yajl_buf.h @@ -23,7 +23,7 @@ /* * Implementation/performance notes. If this were moved to a header * only implementation using #define's where possible we might be - * able to sqeeze a little performance out of the guy by killing function + * able to squeeze a little performance out of the guy by killing function * call overhead. YMMV. */ diff --git a/modules/libcom/src/yajl/yajl_common.h b/modules/libcom/src/yajl/yajl_common.h index fca8454a8..276009f15 100644 --- a/modules/libcom/src/yajl/yajl_common.h +++ b/modules/libcom/src/yajl/yajl_common.h @@ -47,7 +47,7 @@ extern "C" { * ***YAJL 2.2.0*** * This version adds support for JSON5 parsing and generation. * The upstream YAJL repository is no longer being maintained and the - * original author no longer responds to messsages, so while this code + * original author no longer responds to messages, so while this code * has been offered for merging into the upstream it is unlikely that * will ever happen. The version number here is thus an EPICS-specific * construct. diff --git a/modules/libcom/src/yajl/yajl_gen.h b/modules/libcom/src/yajl/yajl_gen.h index aba643a5a..45d6d15ee 100644 --- a/modules/libcom/src/yajl/yajl_gen.h +++ b/modules/libcom/src/yajl/yajl_gen.h @@ -194,7 +194,7 @@ extern "C" { YAJL_API yajl_gen_status yajl_gen_array_close(yajl_gen hand); /** Access the zero-terminated generator buffer. If incrementally - * outputing JSON, one should call yajl_gen_clear() to clear the + * outputting JSON, one should call yajl_gen_clear() to clear the * buffer. This allows stream generation. */ YAJL_API yajl_gen_status yajl_gen_get_buf(yajl_gen hand, const unsigned char ** buf, @@ -210,7 +210,7 @@ extern "C" { * \param hand The generator handle. * \param sep This string will be inserted to separate the previously * generated output from the following; passing \c NULL means - * *no separation* of entites (beware that generating + * *no separation* of entities (beware that generating * multiple JSON numbers without a separator creates * ambiguous output). * diff --git a/modules/libcom/src/yajl/yajl_lex.c b/modules/libcom/src/yajl/yajl_lex.c index 8dbff43da..f79291cb6 100644 --- a/modules/libcom/src/yajl/yajl_lex.c +++ b/modules/libcom/src/yajl/yajl_lex.c @@ -66,7 +66,7 @@ tokToStr(yajl_tok tok) */ struct yajl_lexer_t { - /* the overal line and char offset into the data */ + /* the overall line and char offset into the data */ size_t lineOff; size_t charOff; diff --git a/modules/libcom/src/yajl/yajl_lex.h b/modules/libcom/src/yajl/yajl_lex.h index 7c2a6b9d8..8363de9a5 100644 --- a/modules/libcom/src/yajl/yajl_lex.h +++ b/modules/libcom/src/yajl/yajl_lex.h @@ -66,7 +66,7 @@ void yajl_lex_free(yajl_lexer lexer); /** * run/continue a lex. "offset" is an input/output parameter. * It should be initialized to zero for a - * new chunk of target text, and upon subsetquent calls with the same + * new chunk of target text, and upon subsequent calls with the same * target text should passed with the value of the previous invocation. * * the client may be interested in the value of offset when an error is diff --git a/modules/libcom/src/yajl/yajl_parse.h b/modules/libcom/src/yajl/yajl_parse.h index 90367d978..c7240f4e4 100644 --- a/modules/libcom/src/yajl/yajl_parse.h +++ b/modules/libcom/src/yajl/yajl_parse.h @@ -39,7 +39,7 @@ extern "C" { yajl_status_error } yajl_status; - /** Return a human readable, english, string for an error. */ + /** Return a human readable, English, string for an error. */ YAJL_API const char * yajl_status_to_string(yajl_status code); /** An opaque handle to a parser. */ @@ -151,7 +151,7 @@ extern "C" { yajl_allow_trailing_garbage = 0x04, /** * Allow multiple values to be parsed by a single handle. The entire - * text must be valid JSON, and values can be seperated by any kind of + * text must be valid JSON, and values can be separated by any kind of * whitespace. This flag will change the behavior of the parser, and * cause it to continue parsing after a value is parsed, rather than * transitioning into a complete state. This option can be useful when diff --git a/modules/libcom/src/yajl/yajl_parser.c b/modules/libcom/src/yajl/yajl_parser.c index b134228d2..0627215f5 100644 --- a/modules/libcom/src/yajl/yajl_parser.c +++ b/modules/libcom/src/yajl/yajl_parser.c @@ -171,7 +171,7 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText, return str; } -/* check for client cancelation */ +/* check for client cancellation */ #define _CC_CHK(x) \ if (!(x)) { \ yajl_bs_set(hand->stateStack, yajl_state_parse_error); \ @@ -249,7 +249,7 @@ yajl_do_parse(yajl_handle hand, const unsigned char * jsonText, /* for arrays and maps, we advance the state for this * depth, then push the state of the next depth. * If an error occurs during the parsing of the nesting - * enitity, the state at this level will not matter. + * entity, the state at this level will not matter. * a state that needs pushing will be anything other * than state_start */ diff --git a/modules/libcom/test/epicsAtomicPerform.cpp b/modules/libcom/test/epicsAtomicPerform.cpp index 21f11fd4e..a56f70cfb 100644 --- a/modules/libcom/test/epicsAtomicPerform.cpp +++ b/modules/libcom/test/epicsAtomicPerform.cpp @@ -236,7 +236,7 @@ private: // tests the time it takes to perform a call to an external // function and also increment an integer word. The // epicsInterruptIsInterruptContext function is an -// out-of-line function implemented in a sharable library +// out-of-line function implemented in a shareable library // so hopefully it wont be optimized away. template < class T > inline void OrdinaryIncr < T > :: run () @@ -561,7 +561,7 @@ MAIN ( epicsAtomicPerform ) // The tests running here are measuring fast // functions so they tend to be impacted // by where the cache lines are wrt to the - // virtual pages perhap + // virtual pages perhaps // measure < AtomicSet < int > > (); measure < AtomicSet < size_t > > (); diff --git a/modules/libcom/test/epicsEnvTest.c b/modules/libcom/test/epicsEnvTest.c index dc3cffdc5..543cec77d 100644 --- a/modules/libcom/test/epicsEnvTest.c +++ b/modules/libcom/test/epicsEnvTest.c @@ -18,7 +18,7 @@ * configured to maintain separate, totally independent sets * of environment variables for each thread. This configuration * is not supported by EPICS which expects child threads to at - * least inherit the partent thread's environment variables. + * least inherit the parent thread's environment variables. */ #include diff --git a/modules/libcom/test/epicsInlineTest1.c b/modules/libcom/test/epicsInlineTest1.c index 62da1a134..a572d55ff 100644 --- a/modules/libcom/test/epicsInlineTest1.c +++ b/modules/libcom/test/epicsInlineTest1.c @@ -6,7 +6,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* This test checks the variations on inline function defintions. +/* This test checks the variations on inline function definitions. * * "static inline int func(void) {...}" * diff --git a/modules/libcom/test/epicsMessageQueueTest.cpp b/modules/libcom/test/epicsMessageQueueTest.cpp index c2e041a75..d245cde89 100644 --- a/modules/libcom/test/epicsMessageQueueTest.cpp +++ b/modules/libcom/test/epicsMessageQueueTest.cpp @@ -168,7 +168,7 @@ fastSender(void *arg) epicsMessageQueue *q = (epicsMessageQueue *)arg; numSent = 0; - // Send first withough timeout + // Send first without timeout q->send((void *)msg1, 4); numSent++; diff --git a/modules/libcom/test/epicsStdioTest.c b/modules/libcom/test/epicsStdioTest.c index 6569b5029..be89b4056 100644 --- a/modules/libcom/test/epicsStdioTest.c +++ b/modules/libcom/test/epicsStdioTest.c @@ -132,7 +132,7 @@ MAIN(epicsStdioTest) testPlan(163); testEpicsSnprintf(); #ifdef __rtems__ - /* ensure there is a writeable area */ + /* ensure there is a writable area */ mkdir( "/tmp", S_IRWXU ); testStdoutRedir("/tmp/report"); #else diff --git a/modules/libcom/test/epicsThreadPerform.cpp b/modules/libcom/test/epicsThreadPerform.cpp index aad3a9e68..07238cb33 100644 --- a/modules/libcom/test/epicsThreadPerform.cpp +++ b/modules/libcom/test/epicsThreadPerform.cpp @@ -73,7 +73,7 @@ static double measureSleepQuantum ( for ( unsigned i = 0u; i < iterations; i++ ) { // try to guarantee a uniform probability density function // by intentionally burning some CPU until we are less - // likely to be aligned with the schedualing clock + // likely to be aligned with the scheduling clock double interval = rand (); interval /= RAND_MAX; interval *= testInterval; diff --git a/modules/libcom/test/ipAddrToAsciiTest.cpp b/modules/libcom/test/ipAddrToAsciiTest.cpp index 7e6b9cc00..bbf7383c8 100644 --- a/modules/libcom/test/ipAddrToAsciiTest.cpp +++ b/modules/libcom/test/ipAddrToAsciiTest.cpp @@ -155,7 +155,7 @@ MAIN(ipAddrToAsciiTest) } doCancel(); // TODO: somehow test cancel of in-progress callback - // allow time for any un-canceled transcations to crash us... + // allow time for any un-canceled transactions to crash us... epicsThreadSleep(1.0); #ifdef __linux__