diff --git a/genversion.sh b/genversion.sh index 9b11984eab2..5e6b8159bda 100755 --- a/genversion.sh +++ b/genversion.sh @@ -215,4 +215,4 @@ elif test x"`diff src/XrdVersion.hh.new src/XrdVersion.hh`" != x; then else rm src/XrdVersion.hh.new fi -echo "[I] src/XrdVersion.hh successfuly generated" 1>&2 +echo "[I] src/XrdVersion.hh successfully generated" 1>&2 diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc index 98966b6b217..ec16e0dad2a 100644 --- a/src/XrdCl/XrdClAsyncSocketHandler.cc +++ b/src/XrdCl/XrdClAsyncSocketHandler.cc @@ -71,7 +71,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Connect to gien address + // Connect to given address //---------------------------------------------------------------------------- Status AsyncSocketHandler::Connect( time_t timeout ) { @@ -367,7 +367,7 @@ namespace XrdCl Log *log = DefaultEnv::GetLog(); log->Dump( AsyncSockMsg, - "[%s] Successfuly sent message: %s.", pStreamName.c_str(), + "[%s] successfully sent message: %s.", pStreamName.c_str(), pOutgoing->GetDescription().c_str() ); pStream->OnMessageSent( pSubStreamNum, pOutgoing, pOutMsgSize ); diff --git a/src/XrdCl/XrdClAsyncSocketHandler.hh b/src/XrdCl/XrdClAsyncSocketHandler.hh index 46dbd57de62..05cb879b785 100644 --- a/src/XrdCl/XrdClAsyncSocketHandler.hh +++ b/src/XrdCl/XrdClAsyncSocketHandler.hh @@ -69,7 +69,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Connect to the currently set addres + //! Connect to the currently set address //------------------------------------------------------------------------ Status Connect( time_t timeout ); @@ -139,12 +139,12 @@ namespace XrdCl Status WriteCurrentMessage(); //------------------------------------------------------------------------ - // Got a read rediness event + // Got a read readiness event //------------------------------------------------------------------------ void OnRead(); //------------------------------------------------------------------------ - // Got a read rediness event while handshaking + // Got a read readiness event while handshaking //------------------------------------------------------------------------ void OnReadWhileHandshaking(); diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc index cb984df42bf..b306f27080d 100644 --- a/src/XrdCl/XrdClChannel.cc +++ b/src/XrdCl/XrdClChannel.cc @@ -89,7 +89,7 @@ namespace } //------------------------------------------------------------------------ - // Wait for the arraival of the message + // Wait for the arrival of the message //------------------------------------------------------------------------ XrdCl::Message *GetMessage() { @@ -228,7 +228,7 @@ namespace XrdCl } //-------------------------------------------------------------------------- - // Register the task generating timout events + // Register the task generating timeout events //-------------------------------------------------------------------------- pTickGenerator = new TickGeneratorTask( this, pUrl.GetHostId() ); pTaskManager->RegisterTask( pTickGenerator, ::time(0)+timeoutResolution ); @@ -272,7 +272,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Synchronously receive a message - blocks until a message maching + // Synchronously receive a message - blocks until a message matching //---------------------------------------------------------------------------- Status Channel::Receive( Message *&msg, MessageFilter *filter, @@ -290,7 +290,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Listen to incomming messages + // Listen to incoming messages //---------------------------------------------------------------------------- Status Channel::Receive( IncomingMsgHandler *handler, time_t expires ) { diff --git a/src/XrdCl/XrdClChannel.hh b/src/XrdCl/XrdClChannel.hh index a58e3e71e6a..e494b3ca58e 100644 --- a/src/XrdCl/XrdClChannel.hh +++ b/src/XrdCl/XrdClChannel.hh @@ -49,7 +49,7 @@ namespace XrdCl //! //! @param url address of the server to connect to //! @param poller poller object to be used for non-blocking IO - //! @param transport protocol speciffic transport handler + //! @param transport protocol specific transport handler //! @param taskManager async task handler to be used by the channel //! @param jobManager worker thread handler to be used by the channel //------------------------------------------------------------------------ @@ -87,7 +87,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Send the message asynchronously - the message is inserted into the - //! send queue and a listener is called when the message is successuly + //! send queue and a listener is called when the message is successfully //! pushed through the wire or when the timeout elapses //! //! @param msg message to be sent @@ -95,8 +95,8 @@ namespace XrdCl //! @param expires unix timestamp after which a failure is reported //! to the listener //! @param handler handler to be notified about the status - //! @return success if the message was successfuly inserted - //! into the send quees, failure otherwise + //! @return success if the message was successfully inserted + //! into the send queues, failure otherwise //------------------------------------------------------------------------ Status Send( Message *msg, OutgoingMsgHandler *handler, @@ -105,20 +105,20 @@ namespace XrdCl //------------------------------------------------------------------------ - //! Synchronously receive a message - blocks until a message maching - //! a filter is found in the incomming queue or the timout passes + //! Synchronously receive a message - blocks until a message matching + //! a filter is found in the incoming queue or the timeout passes //! //! @param msg reference to a message pointer, the pointer will //! point to the received message //! @param filter filter object defining what to look for //! @param expires expiration timestamp //! @return success when the message has been received - //! successfuly, failure otherwise + //! successfully, failure otherwise //------------------------------------------------------------------------ Status Receive( Message *&msg, MessageFilter *filter, time_t expires ); //------------------------------------------------------------------------ - //! Listen to incomming messages, the listener is notified when a new + //! Listen to incoming messages, the listener is notified when a new //! message arrives and when the timeout passes //! //! @param handler handler to be notified about new messages diff --git a/src/XrdCl/XrdClChannelHandlerList.hh b/src/XrdCl/XrdClChannelHandlerList.hh index 0f99b488137..39709a87f3c 100644 --- a/src/XrdCl/XrdClChannelHandlerList.hh +++ b/src/XrdCl/XrdClChannelHandlerList.hh @@ -28,7 +28,7 @@ namespace XrdCl { //---------------------------------------------------------------------------- - //! A helper for handling hannel event handlers + //! A helper for handling channel event handlers //---------------------------------------------------------------------------- class ChannelHandlerList { diff --git a/src/XrdCl/XrdClCheckSumManager.cc b/src/XrdCl/XrdClCheckSumManager.cc index 2dee6808ab0..0f0780ffb35 100644 --- a/src/XrdCl/XrdClCheckSumManager.cc +++ b/src/XrdCl/XrdClCheckSumManager.cc @@ -113,7 +113,7 @@ namespace XrdCl //-------------------------------------------------------------------------- // Open the file //-------------------------------------------------------------------------- - log->Debug( UtilityMsg, "Openning %s for reading (chacksum calc)", + log->Debug( UtilityMsg, "Opening %s for reading (checksum calc)", filePath.c_str() ); int fd = open( filePath.c_str(), O_RDONLY ); diff --git a/src/XrdCl/XrdClClassicCopyJob.cc b/src/XrdCl/XrdClClassicCopyJob.cc index 6ea857125cd..93172b839fa 100644 --- a/src/XrdCl/XrdClClassicCopyJob.cc +++ b/src/XrdCl/XrdClClassicCopyJob.cc @@ -289,7 +289,7 @@ namespace //---------------------------------------------------------------------- // Open the file for reading and get it's size //---------------------------------------------------------------------- - log->Debug( UtilityMsg, "Openning %s for reading", pPath.c_str() ); + log->Debug( UtilityMsg, "Opening %s for reading", pPath.c_str() ); int fd = open( pPath.c_str(), O_RDONLY ); if( fd == -1 ) @@ -338,7 +338,7 @@ namespace int64_t bytesRead = read( pFD, buffer, toRead ); if( bytesRead == -1 ) { - log->Debug( UtilityMsg, "Unable read from %s: %s", + log->Debug( UtilityMsg, "Unable to read from %s: %s", pPath.c_str(), strerror( errno ) ); close( pFD ); pFD = -1; @@ -422,7 +422,7 @@ namespace int64_t bRead = read( 0, buffer+offset, toRead ); if( bRead == -1 ) { - log->Debug( UtilityMsg, "Unable read from stdin: %s", + log->Debug( UtilityMsg, "Unable to read from stdin: %s", strerror( errno ) ); delete [] buffer; return XRootDStatus( stError, errOSError, errno ); @@ -684,7 +684,7 @@ namespace //---------------------------------------------------------------------- // Open the file for reading and get it's size //---------------------------------------------------------------------- - log->Debug( UtilityMsg, "Openning %s for writing", pPath.c_str() ); + log->Debug( UtilityMsg, "Opening %s for writing", pPath.c_str() ); int flags = O_WRONLY|O_CREAT|O_TRUNC; if( !pForce ) @@ -988,7 +988,7 @@ namespace XrdCl //-------------------------------------------------------------------------- if( !pJob->checkSumType.empty() ) { - log->Debug( UtilityMsg, "Attempring checksum calculation." ); + log->Debug( UtilityMsg, "Attempting checksum calculation." ); //------------------------------------------------------------------------ // Get the check sum at source diff --git a/src/XrdCl/XrdClCopy.cc b/src/XrdCl/XrdClCopy.cc index 0f33f53ca92..00ee843d3bd 100644 --- a/src/XrdCl/XrdClCopy.cc +++ b/src/XrdCl/XrdClCopy.cc @@ -353,11 +353,11 @@ int main( int argc, char **argv ) //---------------------------------------------------------------------------- // If we have multiple sources and target is not a directory then we cannot - // procees + // proceed //---------------------------------------------------------------------------- if( CountSources(config.srcFile) > 1 && !targetIsDir ) { - std::cerr << "Multuple sources were given but target is not a directory."; + std::cerr << "Multiple sources were given but target is not a directory."; return 255; } diff --git a/src/XrdCl/XrdClDefaultEnv.cc b/src/XrdCl/XrdClDefaultEnv.cc index 3384cdfba99..8436401864b 100644 --- a/src/XrdCl/XrdClDefaultEnv.cc +++ b/src/XrdCl/XrdClDefaultEnv.cc @@ -78,7 +78,7 @@ namespace for( it = topics.begin(); it != topics.end(); ++it ) { //---------------------------------------------------------------------- - // Check for reseting pseudo topics + // Check for resetting pseudo topics //---------------------------------------------------------------------- if( *it == "All" ) { diff --git a/src/XrdCl/XrdClDefaultEnv.hh b/src/XrdCl/XrdClDefaultEnv.hh index 34f6bdc5fa8..7c3f6d0d834 100644 --- a/src/XrdCl/XrdClDefaultEnv.hh +++ b/src/XrdCl/XrdClDefaultEnv.hh @@ -89,7 +89,7 @@ namespace XrdCl static TransportManager *GetTransportManager(); //------------------------------------------------------------------------ - //! Initialize the environemnt + //! Initialize the environment //------------------------------------------------------------------------ static void Initialize(); diff --git a/src/XrdCl/XrdClEnv.hh b/src/XrdCl/XrdClEnv.hh index 5e440235402..b4c4a46fe74 100644 --- a/src/XrdCl/XrdClEnv.hh +++ b/src/XrdCl/XrdClEnv.hh @@ -30,7 +30,7 @@ namespace XrdCl //---------------------------------------------------------------------------- //! A simple key value store intended to hold global configuration. //! It is able to import the settings from the shell environment, the - //! variables imported this way surceede these provided from the C++ + //! variables imported this way supersede these provided from the C++ //! code. //---------------------------------------------------------------------------- class Env diff --git a/src/XrdCl/XrdClFS.cc b/src/XrdCl/XrdClFS.cc index 341e7d75336..7c2eb1f7a14 100644 --- a/src/XrdCl/XrdClFS.cc +++ b/src/XrdCl/XrdClFS.cc @@ -971,7 +971,7 @@ XRootDStatus PrintHelp( FileSystem *, Env *, printf( " Obtain server information. Query codes:\n\n" ); printf( " config Server configuration\n" ); - printf( " checksumcancel File checksum cancelation\n" ); + printf( " checksumcancel File checksum cancellation\n" ); printf( " checksum File checksum\n" ); printf( " opaque Implementation dependent\n" ); printf( " opaquefile Implementation dependent\n" ); diff --git a/src/XrdCl/XrdClFSExecutor.hh b/src/XrdCl/XrdClFSExecutor.hh index ff62e28ca83..fb88cd4229c 100644 --- a/src/XrdCl/XrdClFSExecutor.hh +++ b/src/XrdCl/XrdClFSExecutor.hh @@ -49,7 +49,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Constructor //! - //! @param url the sercer that the executor should contact + //! @param url the server that the executor should contact //! @param env execution environment, the executor takes ownership over it //------------------------------------------------------------------------ FSExecutor( const URL &url, Env *env = 0 ); diff --git a/src/XrdCl/XrdClFile.cc b/src/XrdCl/XrdClFile.cc index 8cf81b705a5..143a7f92d7b 100644 --- a/src/XrdCl/XrdClFile.cc +++ b/src/XrdCl/XrdClFile.cc @@ -156,7 +156,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Write a data chank at a given offset - async + // Write a data chunk at a given offset - async //---------------------------------------------------------------------------- XRootDStatus File::Write( uint64_t offset, uint32_t size, diff --git a/src/XrdCl/XrdClFile.hh b/src/XrdCl/XrdClFile.hh index 6576f2f5063..cb80868a528 100644 --- a/src/XrdCl/XrdClFile.hh +++ b/src/XrdCl/XrdClFile.hh @@ -103,7 +103,7 @@ namespace XrdCl //! @param force do not use the cached information, force re-stating //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a StatInfo object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -164,7 +164,7 @@ namespace XrdCl uint16_t timeout = 0 ); //------------------------------------------------------------------------ - //! Write a data chank at a given offset - async + //! Write a data chunk at a given offset - async //! The call interprets and returns the server response, which may be //! either a success or a failure, it does not contain the number //! of bytes that were actually written. diff --git a/src/XrdCl/XrdClFileStateHandler.cc b/src/XrdCl/XrdClFileStateHandler.cc index 1e4d72b1cdf..4168b301e35 100644 --- a/src/XrdCl/XrdClFileStateHandler.cc +++ b/src/XrdCl/XrdClFileStateHandler.cc @@ -326,7 +326,7 @@ namespace XrdCl } //-------------------------------------------------------------------------- - // Check if the recovery procedures should be enables + // Check if the recovery procedures should be enabled //-------------------------------------------------------------------------- const URL::ParamsMap &urlParams = pFileUrl->GetParams(); URL::ParamsMap::const_iterator it; @@ -545,7 +545,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Write a data chank at a given offset - async + // Write a data chunk at a given offset - async //---------------------------------------------------------------------------- XRootDStatus FileStateHandler::Write( uint64_t offset, uint32_t size, @@ -874,7 +874,7 @@ namespace XrdCl pStatInfo = new StatInfo( *openInfo->GetStatInfo() ); } - log->Debug( FileMsg, "[0x%x@%s] Successfuly opened at %s, handle: 0x%x, " + log->Debug( FileMsg, "[0x%x@%s] successfully opened at %s, handle: 0x%x, " "session id: %ld", this, pFileUrl->GetURL().c_str(), pDataServer->GetHostId().c_str(), *((uint32_t*)pFileHandle), pSessionId ); @@ -1180,7 +1180,7 @@ namespace XrdCl //------------------------------------------------------------------------ // Invalid session id means that the connection has been broken while we - // were iddle so we haven't been informed about this fact earlier. + // were idle so we haven't been informed about this fact earlier. //------------------------------------------------------------------------ if( !st.IsOK() && st.code == errInvalidSession && IsRecoverable( st ) ) return RecoverMessage( RequestData( msg, handler, sendParams ), false ); diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh index f29f65ae472..4ef43e47bd7 100644 --- a/src/XrdCl/XrdClFileStateHandler.hh +++ b/src/XrdCl/XrdClFileStateHandler.hh @@ -32,7 +32,7 @@ namespace XrdCl class Message; //---------------------------------------------------------------------------- - //! Handle the statefull operations + //! Handle the stateful operations //---------------------------------------------------------------------------- class FileStateHandler { @@ -94,7 +94,7 @@ namespace XrdCl //! @param force do not use the cached information, force re-stating //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a StatInfo object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -113,7 +113,7 @@ namespace XrdCl //! or 0 if the buffer should be allocated by the system //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a buffer object if - //! the procedure was successful, if a prealocated + //! the procedure was successful, if a preallocated //! buffer was specified then the buffer object will //! "wrap" this buffer //! @param timeout timeout value, if 0 the environment default will be @@ -127,7 +127,7 @@ namespace XrdCl uint16_t timeout = 0 ); //------------------------------------------------------------------------ - //! Write a data chank at a given offset - async + //! Write a data chunk at a given offset - async //! //! @param offset offset from the beginning of the file //! @param size number of bytes to be written @@ -279,7 +279,7 @@ namespace XrdCl private: //------------------------------------------------------------------------ - // Helper for queueing messages + // Helper for queuing messages //------------------------------------------------------------------------ struct RequestData { diff --git a/src/XrdCl/XrdClFileSystem.cc b/src/XrdCl/XrdClFileSystem.cc index 598d82829d7..b98b3fdd5d9 100644 --- a/src/XrdCl/XrdClFileSystem.cc +++ b/src/XrdCl/XrdClFileSystem.cc @@ -1013,7 +1013,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Assign a loadbalancer if it has not already been assigned + // Assign a load balancer if it has not already been assigned //---------------------------------------------------------------------------- void FileSystem::AssignLoadBalancer( const URL &url ) { diff --git a/src/XrdCl/XrdClFileSystem.hh b/src/XrdCl/XrdClFileSystem.hh index b3fb016a3b5..5f947e7b443 100644 --- a/src/XrdCl/XrdClFileSystem.hh +++ b/src/XrdCl/XrdClFileSystem.hh @@ -45,7 +45,7 @@ namespace XrdCl enum Code { Config = kXR_Qconfig, //!< Query server configuration - ChecksumCancel = kXR_Qckscan, //!< Query file checksum cancelation + ChecksumCancel = kXR_Qckscan, //!< Query file checksum cancellation Checksum = kXR_Qcksum, //!< Query file checksum Opaque = kXR_Qopaque, //!< Implementation dependent OpaqueFile = kXR_Qopaquf, //!< Implementation dependent @@ -68,7 +68,7 @@ namespace XrdCl enum Flags { None = 0, //!< Nothing - Delete = kXR_delete, //!< Open a new file, deleting any axisting + Delete = kXR_delete, //!< Open a new file, deleting any existing //!< file Force = kXR_force, //!< Ignore file usage rules MakePath = kXR_mkpath, //!< Create directory path if it does not @@ -195,7 +195,7 @@ namespace XrdCl //! @param flags some of the OpenFlags::Flags //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a Buffer object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -227,7 +227,7 @@ namespace XrdCl //! @param flags some of the OpenFlags::Flags //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a Buffer object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -287,7 +287,7 @@ namespace XrdCl //! @param arg query argument //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a Buffer object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -474,7 +474,7 @@ namespace XrdCl //! @param path file/directory path //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a StatInfo object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -502,7 +502,7 @@ namespace XrdCl //! @param path file/directory path //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a StatInfoVFS object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -529,7 +529,7 @@ namespace XrdCl //! //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a ProtocolInfo object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -555,7 +555,7 @@ namespace XrdCl //! @param flags currently unused //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a DirectoryList - //! object if the procedure is successfull + //! object if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -586,7 +586,7 @@ namespace XrdCl //! @param info the info string to be sent //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a Buffer object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -616,7 +616,7 @@ namespace XrdCl //! @param priority priority of the request 0 (lowest) - 3 (highest) //! @param handler handler to be notified when the response arrives, //! the response parameter will hold a Buffer object - //! if the procedure is successfull + //! if the procedure is successful //! @param timeout timeout value, if 0 the environment default will //! be used //! @return status of the operation @@ -654,7 +654,7 @@ namespace XrdCl const MessageSendParams ¶ms ); //------------------------------------------------------------------------ - // Assign a loadbalancer if it has not already been assigned + // Assign a load balancer if it has not already been assigned //------------------------------------------------------------------------ void AssignLoadBalancer( const URL &url ); diff --git a/src/XrdCl/XrdClInQueue.cc b/src/XrdCl/XrdClInQueue.cc index 9c6e593e413..5e02be074ce 100644 --- a/src/XrdCl/XrdClInQueue.cc +++ b/src/XrdCl/XrdClInQueue.cc @@ -58,7 +58,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Add a listener that should be notified about incomming messages + // Add a listener that should be notified about incoming messages //---------------------------------------------------------------------------- void InQueue::AddMessageHandler( IncomingMsgHandler *handler, time_t expires ) { @@ -88,8 +88,8 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Get a message handler inerested in receiving message whose header - // is storead in msg + // Get a message handler interested in receiving message whose header + // is stored in msg //---------------------------------------------------------------------------- IncomingMsgHandler *InQueue::GetHandlerForMessage( Message *msg, time_t &expires, diff --git a/src/XrdCl/XrdClInQueue.hh b/src/XrdCl/XrdClInQueue.hh index f8a413bff11..373094bd2f2 100644 --- a/src/XrdCl/XrdClInQueue.hh +++ b/src/XrdCl/XrdClInQueue.hh @@ -30,7 +30,7 @@ namespace XrdCl class Message; //---------------------------------------------------------------------------- - //! A synchronize queue for incomming data + //! A synchronize queue for incoming data //---------------------------------------------------------------------------- class InQueue { @@ -41,7 +41,7 @@ namespace XrdCl bool AddMessage( Message *msg ); //------------------------------------------------------------------------ - //! Add a listener that should be notified about incomming messages + //! Add a listener that should be notified about incoming messages //! //! @param handler message handler //! @param expires time when the message handler expires @@ -49,8 +49,8 @@ namespace XrdCl void AddMessageHandler( IncomingMsgHandler *handler, time_t expires ); //------------------------------------------------------------------------ - //! Get a message handler inerested in receiving message whose header - //! is storead in msg + //! Get a message handler interested in receiving message whose header + //! is stored in msg //! //! @param msg message header //! @param expires handle's expiration timestamp diff --git a/src/XrdCl/XrdClMessageUtils.cc b/src/XrdCl/XrdClMessageUtils.cc index 0de372c4584..4db042df7d1 100644 --- a/src/XrdCl/XrdClMessageUtils.cc +++ b/src/XrdCl/XrdClMessageUtils.cc @@ -103,7 +103,7 @@ namespace XrdCl } //-------------------------------------------------------------------------- - // Send the messafe + // Send the message //-------------------------------------------------------------------------- st = postMaster->Send( url, msg, msgHandler, sendParams.stateful, sendParams.expires ); diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh index c0728791108..013c51db4a3 100644 --- a/src/XrdCl/XrdClMonitor.hh +++ b/src/XrdCl/XrdClMonitor.hh @@ -203,7 +203,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Event codes passed to the Event() method. Event code values not - //! listed here, if encounetered, should be ignored. + //! listed here, if encountered, should be ignored. //------------------------------------------------------------------------ enum EventCode { @@ -212,7 +212,7 @@ namespace XrdCl EvCheckSum, //!< CheckSumInfo: File checksummed EvOpen, //!< OpenInfo: File opened EvClose, //!< CloseInfo: File closed - EvErrIO, //!< ErrorInfo: An I/O error occured + EvErrIO, //!< ErrorInfo: An I/O error occurred EvConnect, //!< ConnectInfo: Login into a server EvDisconnect //!< DisconnectInfo: Logout from a server @@ -221,7 +221,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Inform the monitor of an event. //! - //! @parm evCode is the event that occured (see enum evNum) + //! @parm evCode is the event that occurred (see enum evNum) //! @parm evInfo is the event information structure describing the event //! it is cast to (void *) so that one method can be used //! and should be recast to the correct corresponding struct diff --git a/src/XrdCl/XrdClOptimizers.hh b/src/XrdCl/XrdClOptimizers.hh index 4d7f2f2e0aa..36682d1b680 100644 --- a/src/XrdCl/XrdClOptimizers.hh +++ b/src/XrdCl/XrdClOptimizers.hh @@ -16,7 +16,7 @@ // along with XRootD. If not, see . //------------------------------------------------------------------------------ -#ifndef __XRD_CL_OPRIMIZERS_HH__ +#ifndef __XRD_CL_OPTIMIZERS_HH__ #define __XRD_CL_OPTIMIZERS_HH__ #ifdef __GNUC__ diff --git a/src/XrdCl/XrdClOutQueue.hh b/src/XrdCl/XrdClOutQueue.hh index 858a63f9838..01aaaee8e49 100644 --- a/src/XrdCl/XrdClOutQueue.hh +++ b/src/XrdCl/XrdClOutQueue.hh @@ -29,7 +29,7 @@ namespace XrdCl class OutgoingMsgHandler; //---------------------------------------------------------------------------- - //! A synchronized queue for the outgoind data + //! A synchronized queue for the outgoing data //---------------------------------------------------------------------------- class OutQueue { @@ -43,7 +43,7 @@ namespace XrdCl //! @param expires timeout //! @param stateful if true a disconnection will cause an error and //! removing from the queue, otherwise sending - //! wil be retattempted + //! wil be re-attempted //------------------------------------------------------------------------ void PushBack( Message *msg, OutgoingMsgHandler *handler, @@ -59,7 +59,7 @@ namespace XrdCl //! @param expires timeout //! @param stateful if true a disconnection will cause an error and //! removing from the queue, otherwise sending - //! wil be retattempted + //! wil be re-attempted //------------------------------------------------------------------------ void PushFront( Message *msg, OutgoingMsgHandler *handler, diff --git a/src/XrdCl/XrdClPoller.hh b/src/XrdCl/XrdClPoller.hh index 49dfb78a469..928439f19ee 100644 --- a/src/XrdCl/XrdClPoller.hh +++ b/src/XrdCl/XrdClPoller.hh @@ -60,7 +60,7 @@ namespace XrdCl virtual void Finalize() {}; //------------------------------------------------------------------------ - //! Called when an event occured on a given socket + //! Called when an event occurred on a given socket //------------------------------------------------------------------------ virtual void Event( uint8_t type, Socket *socket ) = 0; @@ -130,7 +130,7 @@ namespace XrdCl //! //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no read event occured after this time a timeout + //! @param timeout if no read event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableReadNotification( Socket *socket, @@ -141,7 +141,7 @@ namespace XrdCl //! Notify the handler about write events //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no write event occured after this time a timeout + //! @param timeout if no write event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableWriteNotification( Socket *socket, diff --git a/src/XrdCl/XrdClPollerBuiltIn.cc b/src/XrdCl/XrdClPollerBuiltIn.cc index 47ee5a5fd12..45b63646ce6 100644 --- a/src/XrdCl/XrdClPollerBuiltIn.cc +++ b/src/XrdCl/XrdClPollerBuiltIn.cc @@ -130,7 +130,7 @@ namespace XrdCl pPoller = IOEvents::Poller::Create( errNum, &errMsg ); if( !pPoller ) { - log->Error( PollerMsg, "Unable to create the interal poller object: ", + log->Error( PollerMsg, "Unable to create the internal poller object: ", "%s (%s)", strerror( errno ), errMsg ); return false; } diff --git a/src/XrdCl/XrdClPollerBuiltIn.hh b/src/XrdCl/XrdClPollerBuiltIn.hh index 4c69dc7fe89..d2c42624b3a 100644 --- a/src/XrdCl/XrdClPollerBuiltIn.hh +++ b/src/XrdCl/XrdClPollerBuiltIn.hh @@ -81,7 +81,7 @@ namespace XrdCl //! //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no read event occured after this time a timeout + //! @param timeout if no read event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableReadNotification( Socket *socket, @@ -93,7 +93,7 @@ namespace XrdCl //! //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no write event occured after this time a timeout + //! @param timeout if no write event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableWriteNotification( Socket *socket, diff --git a/src/XrdCl/XrdClPollerLibEvent.cc b/src/XrdCl/XrdClPollerLibEvent.cc index 30c3f9c0b13..8dd92c17b5e 100644 --- a/src/XrdCl/XrdClPollerLibEvent.cc +++ b/src/XrdCl/XrdClPollerLibEvent.cc @@ -175,7 +175,7 @@ namespace XrdCl Log *log = DefaultEnv::GetLog(); //-------------------------------------------------------------------------- - // Print some debing info + // Print some debugging info //-------------------------------------------------------------------------- const char *compiledVersion = LIBEVENT_VERSION; const char *runningVersion = event_get_version(); diff --git a/src/XrdCl/XrdClPollerLibEvent.hh b/src/XrdCl/XrdClPollerLibEvent.hh index fe7c0778483..5962c9b1da4 100644 --- a/src/XrdCl/XrdClPollerLibEvent.hh +++ b/src/XrdCl/XrdClPollerLibEvent.hh @@ -82,7 +82,7 @@ namespace XrdCl //! //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no read event occured after this time a timeout + //! @param timeout if no read event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableReadNotification( Socket *socket, @@ -94,7 +94,7 @@ namespace XrdCl //! //! @param socket the socket //! @param notify specify if the handler should be notified - //! @param timeout if no write event occured after this time a timeout + //! @param timeout if no write event occurred after this time a timeout //! event will be generated //------------------------------------------------------------------------ virtual bool EnableWriteNotification( Socket *socket, diff --git a/src/XrdCl/XrdClPostMaster.cc b/src/XrdCl/XrdClPostMaster.cc index 443feb8470f..eefc26432e6 100644 --- a/src/XrdCl/XrdClPostMaster.cc +++ b/src/XrdCl/XrdClPostMaster.cc @@ -210,7 +210,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Listen to incomming messages + // Listen to incoming messages //---------------------------------------------------------------------------- Status PostMaster::Receive( const URL &url, IncomingMsgHandler *handler, diff --git a/src/XrdCl/XrdClPostMaster.hh b/src/XrdCl/XrdClPostMaster.hh index 2e7cdce10e9..2e15be1e9f3 100644 --- a/src/XrdCl/XrdClPostMaster.hh +++ b/src/XrdCl/XrdClPostMaster.hh @@ -37,7 +37,7 @@ namespace XrdCl class JobManager; //---------------------------------------------------------------------------- - //! A hub for dispaching and receiving messages + //! A hub for dispatching and receiving messages //---------------------------------------------------------------------------- class PostMaster { @@ -99,7 +99,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Send the message asynchronously - the message is inserted into the - //! send queue and a listener is called when the message is successuly + //! send queue and a listener is called when the message is succesfsully //! pushed through the wire or when the timeout elapses //! //! DEADLOCK WARNING: no lock should be taken while calling this method @@ -111,8 +111,8 @@ namespace XrdCl //! to the handler //! @param handler handler will be notified about the status //! @param stateful physical stream disconnection causes an error - //! @return success if the message was successfuly inserted - //! into the send quees, failure otherwise + //! @return success if the message was successfully inserted + //! into the send queues, failure otherwise //------------------------------------------------------------------------ Status Send( const URL &url, Message *msg, @@ -121,8 +121,8 @@ namespace XrdCl time_t expires ); //------------------------------------------------------------------------ - //! Synchronously receive a message - blocks until a message maching - //! a filter is found in the incomming queue or the timout passes + //! Synchronously receive a message - blocks until a message matching + //! a filter is found in the incoming queue or the timeout passes //! //! @param url sender of the message //! @param msg reference to a message pointer, the pointer will @@ -130,7 +130,7 @@ namespace XrdCl //! @param filter filter object defining what to look for //! @param expires expiration timestamp //! @return success when the message has been received - //! successfuly, failure otherwise + //! successfully, failure otherwise //------------------------------------------------------------------------ Status Receive( const URL &url, Message *&msg, @@ -138,7 +138,7 @@ namespace XrdCl time_t expires ); //------------------------------------------------------------------------ - //! Listen to incomming messages, the listener is notified when a new + //! Listen to incoming messages, the listener is notified when a new //! message arrives and when the timeout passes //! //! @param url sender of the message diff --git a/src/XrdCl/XrdClPostMasterInterfaces.hh b/src/XrdCl/XrdClPostMasterInterfaces.hh index 8408d33a1db..258fbf51519 100644 --- a/src/XrdCl/XrdClPostMasterInterfaces.hh +++ b/src/XrdCl/XrdClPostMasterInterfaces.hh @@ -62,7 +62,7 @@ namespace XrdCl Ignore = 0x0002, //!< Ignore the message RemoveHandler = 0x0004, //!< Remove the handler from the notification //!< list - Raw = 0x0008, //!< the handler is interested in reding + Raw = 0x0008, //!< the handler is interested in reading //!< the message body directly from the //!< socket NoProcess = 0x0010 //!< don't call the processing callback @@ -71,13 +71,13 @@ namespace XrdCl }; //------------------------------------------------------------------------ - //! Events that may have occured to the stream + //! Events that may have occurred to the stream //------------------------------------------------------------------------ enum StreamEvent { Ready = 1, //!< The stream has become connected Broken = 2, //!< The stream is broken - Timeout = 3, //!< The declared timeout has occured + Timeout = 3, //!< The declared timeout has occurred FatalError = 4 //!< Stream has been broken and won't be recovered }; @@ -88,7 +88,7 @@ namespace XrdCl virtual ~IncomingMsgHandler() {} //------------------------------------------------------------------------ - //! Examine an incomming message, and decide on the action to be taken + //! Examine an incoming message, and decide on the action to be taken //! //! @param msg the message, may be zero if receive failed //! @return action type that needs to be take wrt the message and @@ -193,7 +193,7 @@ namespace XrdCl { public: //------------------------------------------------------------------------ - //! Events that may have occured to the channel + //! Events that may have occurred to the channel //------------------------------------------------------------------------ enum ChannelEvent { @@ -210,7 +210,7 @@ namespace XrdCl //------------------------------------------------------------------------ //! Event callback //! - //! @param event the event that has occured + //! @param event the event that has occurred //! @param stream the stream concerned //! @param status the status info //! @return true if the handler should be kept @@ -296,9 +296,9 @@ namespace XrdCl //------------------------------------------------------------------------ //! Read a message header from the socket, the socket is non-blocking, - //! so if there is not enough data the function should retutn errRetry + //! so if there is not enough data the function should return errRetry //! in which case it will be called again when more data arrives, with - //! the data previousely read stored in the message buffer + //! the data previously read stored in the message buffer //! //! @param message the message buffer //! @param socket the socket diff --git a/src/XrdCl/XrdClRequestSync.hh b/src/XrdCl/XrdClRequestSync.hh index fbdad780cb5..132d6d2071e 100644 --- a/src/XrdCl/XrdClRequestSync.hh +++ b/src/XrdCl/XrdClRequestSync.hh @@ -85,7 +85,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Number of tasks finishig with an error + //! Number of tasks finishing with an error //------------------------------------------------------------------------ uint32_t FailureCount() const { diff --git a/src/XrdCl/XrdClSIDManager.hh b/src/XrdCl/XrdClSIDManager.hh index 572a85bc2fa..81bb9d7de39 100644 --- a/src/XrdCl/XrdClSIDManager.hh +++ b/src/XrdCl/XrdClSIDManager.hh @@ -73,7 +73,7 @@ namespace XrdCl void ReleaseAllTimedOut(); //------------------------------------------------------------------------ - //! Number of timeoud sids + //! Number of timeout sids //------------------------------------------------------------------------ uint32_t NumberOfTimedOutSIDs() const { diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc index e875191b2ff..a5cff1acf6f 100644 --- a/src/XrdCl/XrdClSocket.cc +++ b/src/XrdCl/XrdClSocket.cc @@ -243,7 +243,7 @@ namespace XrdCl return Status( stError, errInvalidOp ); //-------------------------------------------------------------------------- - // Some usefull variables + // Some useful variables //-------------------------------------------------------------------------- bytesRead = 0; @@ -338,7 +338,7 @@ namespace XrdCl return Status( stError, errInvalidOp ); //-------------------------------------------------------------------------- - // Some usefull variables + // Some useful variables //-------------------------------------------------------------------------- bytesWritten = 0; @@ -466,7 +466,7 @@ namespace XrdCl //-------------------------------------------------------------------------- // We loop on poll because it may return -1 even thought no fatal error - // has occured, these may be: + // has occurred, these may be: // * a signal interrupting the execution (errno == EINTR) // * a failure to initialize some internal structures (Solaris only) // (errno == EAGAIN) diff --git a/src/XrdCl/XrdClStatus.cc b/src/XrdCl/XrdClStatus.cc index ddef97055b8..ca12c9d9669 100644 --- a/src/XrdCl/XrdClStatus.cc +++ b/src/XrdCl/XrdClStatus.cc @@ -48,7 +48,7 @@ namespace { errPollerError, "Poller error" }, { errSocketOptError, "Socket opt error" }, { errStreamDisconnect, "Stream disconnect" }, - { errConnectionError, "Conection error" }, + { errConnectionError, "Connection error" }, { errInvalidSession, "Invalid session" }, { errInvalidMessage, "Invalid message" }, { errNotFound, "Resource not found" }, diff --git a/src/XrdCl/XrdClStatus.hh b/src/XrdCl/XrdClStatus.hh index b243a7760bb..6b079f89bd1 100644 --- a/src/XrdCl/XrdClStatus.hh +++ b/src/XrdCl/XrdClStatus.hh @@ -29,7 +29,7 @@ namespace XrdCl // Constants //---------------------------------------------------------------------------- const uint16_t stOK = 0x0000; //!< Everything went OK - const uint16_t stError = 0x0001; //!< An error occured that could potentially be retried + const uint16_t stError = 0x0001; //!< An error occurred that could potentially be retried const uint16_t stFatal = 0x0003; //!< Fatal error, it's still an error //---------------------------------------------------------------------------- @@ -98,7 +98,7 @@ namespace XrdCl const uint16_t errErrorResponse = 400; //---------------------------------------------------------------------------- - //! Proceure execution status + //! Procedure execution status //---------------------------------------------------------------------------- struct Status { diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc index 98f2c44b582..61f57de509f 100644 --- a/src/XrdCl/XrdClStream.cc +++ b/src/XrdCl/XrdClStream.cc @@ -144,7 +144,7 @@ namespace XrdCl Disconnect( true ); Log *log = DefaultEnv::GetLog(); - log->Debug( PostMasterMsg, "[%s] Destructing stream", + log->Debug( PostMasterMsg, "[%s] Destroying stream", pStreamName.c_str() ); MonitorDisconnection( Status() ); @@ -214,8 +214,8 @@ namespace XrdCl //-------------------------------------------------------------------------- // The main stream is not connected, we need to check whether enough time - // has passed since we last encoutnered an error (if any) so that we could - // reattempt the connection + // has passed since we last encountered an error (if any) so that we could + // re-attempt the connection //-------------------------------------------------------------------------- Log *log = DefaultEnv::GetLog(); time_t now = ::time(0); @@ -588,7 +588,7 @@ namespace XrdCl } //-------------------------------------------------------------------------- - // Check if we still have time to try and do somethig in the current window + // Check if we still have time to try and do something in the current window //-------------------------------------------------------------------------- time_t elapsed = now-pConnectionInitTime; if( elapsed < pConnectionWindow ) @@ -652,7 +652,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Call back when an error has occured + // Call back when an error has occurred //---------------------------------------------------------------------------- void Stream::OnError( uint16_t subStream, Status status ) { diff --git a/src/XrdCl/XrdClStream.hh b/src/XrdCl/XrdClStream.hh index 316007ffa9e..dd4d694f7dc 100644 --- a/src/XrdCl/XrdClStream.hh +++ b/src/XrdCl/XrdClStream.hh @@ -247,9 +247,9 @@ namespace XrdCl private: - //---------------------------------------------------------------------------- + //------------------------------------------------------------------------ // Job queuing the incoming messages - //---------------------------------------------------------------------------- + //------------------------------------------------------------------------ class QueueIncMsgJob: public Job { public: @@ -264,9 +264,9 @@ namespace XrdCl InQueue *pQueue; }; - //---------------------------------------------------------------------------- + //------------------------------------------------------------------------ // Job handling the incoming messages - //---------------------------------------------------------------------------- + //------------------------------------------------------------------------ class HandleIncMsgJob: public Job { public: diff --git a/src/XrdCl/XrdClTaskManager.cc b/src/XrdCl/XrdClTaskManager.cc index aa16cc0f706..86664f66089 100644 --- a/src/XrdCl/XrdClTaskManager.cc +++ b/src/XrdCl/XrdClTaskManager.cc @@ -166,7 +166,7 @@ namespace XrdCl //------------------------------------------------------------------------ // Remove the tasks from the active set - super inefficient, - // but, hopefuly, never really necessary. We first need tu build a list + // but, hopefully, never really necessary. We first need to build a list // of iterators because it is impossible to remove elements from // a multiset when iterating over it //------------------------------------------------------------------------ diff --git a/src/XrdCl/XrdClTaskManager.hh b/src/XrdCl/XrdClTaskManager.hh index 10792164ea2..d0ad27b941e 100644 --- a/src/XrdCl/XrdClTaskManager.hh +++ b/src/XrdCl/XrdClTaskManager.hh @@ -69,7 +69,7 @@ namespace XrdCl //---------------------------------------------------------------------------- //! Run short tasks at a given time in the future //! - //! The task manager just runs one extra thread so the execution of one taks + //! The task manager just runs one extra thread so the execution of one tasks //! may interfere with the execution of another //---------------------------------------------------------------------------- class TaskManager @@ -101,7 +101,7 @@ namespace XrdCl //! Run the given task at the given time. //! //! @param task task to be run - //! @param time time at which the task schould be run + //! @param time time at which the task should be run //! @param own determines whether the task object should be destroyed //! when no longer needed //------------------------------------------------------------------------ diff --git a/src/XrdCl/XrdClThirdPartyCopyJob.cc b/src/XrdCl/XrdClThirdPartyCopyJob.cc index 7462f00ae21..d5a264da024 100644 --- a/src/XrdCl/XrdClThirdPartyCopyJob.cc +++ b/src/XrdCl/XrdClThirdPartyCopyJob.cc @@ -200,7 +200,7 @@ namespace XrdCl pJob->sources[0].GetURL().c_str() ); //-------------------------------------------------------------------------- - // Open the source and set up the randez-vous + // Open the source and set up the rendez-vous //-------------------------------------------------------------------------- File sourceFile; st = sourceFile.Open( pJob->sources[0].GetURL(), OpenFlags::Read ); @@ -216,7 +216,7 @@ namespace XrdCl st = targetFile.Sync(); if( !st.IsOK() ) { - log->Error( UtilityMsg, "Unable set up randez-vous: %s", + log->Error( UtilityMsg, "Unable set up rendez-vous: %s", st.ToStr().c_str() ); sourceFile.Close(); targetFile.Close(); @@ -265,7 +265,7 @@ namespace XrdCl } //-------------------------------------------------------------------------- - // Sync has returned so we can check if it was successfull + // Sync has returned so we can check if it was successful //-------------------------------------------------------------------------- st = *statusHandler.GetStatus(); @@ -290,7 +290,7 @@ namespace XrdCl //-------------------------------------------------------------------------- if( !pJob->checkSumType.empty() ) { - log->Debug( UtilityMsg, "Attemping checksum calculation." ); + log->Debug( UtilityMsg, "Attempting checksum calculation." ); //------------------------------------------------------------------------ // Get the check sum at source @@ -437,7 +437,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Generate a randez-vous key + // Generate a rendez-vous key //---------------------------------------------------------------------------- std::string ThirdPartyCopyJob::GenerateKey() { diff --git a/src/XrdCl/XrdClUtils.cc b/src/XrdCl/XrdClUtils.cc index aa0e3906208..65c337ad96a 100644 --- a/src/XrdCl/XrdClUtils.cc +++ b/src/XrdCl/XrdClUtils.cc @@ -97,7 +97,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Get the elapsed mictoseconds between two timevals + // Get the elapsed microseconds between two timevals //---------------------------------------------------------------------------- uint64_t Utils::GetElapsedMicroSecs( timeval start, timeval end ) { diff --git a/src/XrdCl/XrdClUtils.hh b/src/XrdCl/XrdClUtils.hh index d37dcc654b7..3ce0692bd2c 100644 --- a/src/XrdCl/XrdClUtils.hh +++ b/src/XrdCl/XrdClUtils.hh @@ -86,7 +86,7 @@ namespace XrdCl static std::string TimeToString( time_t timestamp ); //------------------------------------------------------------------------ - //! Get the elapsed mictoseconds between two timevals + //! Get the elapsed microseconds between two timevals //------------------------------------------------------------------------ static uint64_t GetElapsedMicroSecs( timeval start, timeval end ); diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc index f49a6dd1db6..d31bd5d373d 100644 --- a/src/XrdCl/XrdClXRootDMsgHandler.cc +++ b/src/XrdCl/XrdClXRootDMsgHandler.cc @@ -62,7 +62,7 @@ namespace namespace XrdCl { //---------------------------------------------------------------------------- - // Examine an incomming message, and decide on the action to be taken + // Examine an incoming message, and decide on the action to be taken //---------------------------------------------------------------------------- uint16_t XRootDMsgHandler::Examine( Message *msg ) { @@ -360,7 +360,7 @@ namespace XrdCl if( flags & kXR_isManager ) { //------------------------------------------------------------------ - // If the current server is a meta manager then it superseeds + // If the current server is a meta manager then it supersedes // any existing load balancer, otherwise we assign a load-balancer // only if it has not been already assigned //------------------------------------------------------------------ @@ -665,7 +665,7 @@ namespace XrdCl //---------------------------------------------------------------------- // We cannot afford to read the next header from the stream because - // we will cross the message boundry + // we will cross the message boundary //---------------------------------------------------------------------- if( pReadVRawMsgOffset + 16 > pAsyncMsgSize ) { @@ -726,7 +726,7 @@ namespace XrdCl //---------------------------------------------------------------------- if( !chunkFound ) { - log->Error( XRootDMsg, "[%s] ReadRawReadV: Imposible to find chunk " + log->Error( XRootDMsg, "[%s] ReadRawReadV: Impossible to find chunk " "buffer corresponding to %d bytes at %ld.", pUrl.GetHostId().c_str(), pReadVRawChunkHeader.rlen, pReadVRawChunkHeader.offset ); @@ -742,7 +742,7 @@ namespace XrdCl //---------------------------------------------------------------------- // The chunk was found, but reading all the data will cross the message - // boundry + // boundary //---------------------------------------------------------------------- if( pReadVRawMsgOffset + pReadVRawChunkHeader.rlen > pAsyncMsgSize ) { @@ -750,7 +750,7 @@ namespace XrdCl log->Error( XRootDMsg, "[%s] ReadRawReadV: Malformed chunk header: " "reading %d bytes from message would cross the message " - "boundry, discarding %d bytes.", pUrl.GetHostId().c_str(), + "boundary, discarding %d bytes.", pUrl.GetHostId().c_str(), pReadVRawChunkHeader.rlen, discardSize ); pAsyncOffset = 0; @@ -861,7 +861,7 @@ namespace XrdCl Log *log = DefaultEnv::GetLog(); //-------------------------------------------------------------------------- - // We were successfull, so we now need to listen for a response + // We were successful, so we now need to listen for a response //-------------------------------------------------------------------------- if( status.IsOK() ) { @@ -1397,7 +1397,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Some requests need to be rewriten also after getting kXR_wait + // Some requests need to be rewritten also after getting kXR_wait //---------------------------------------------------------------------------- Status XRootDMsgHandler::RewriteRequestWait() { @@ -1447,7 +1447,7 @@ namespace XrdCl UnPackReadVResponse( pResponse ); //-------------------------------------------------------------------------- - // See if all the chunks are OK and put them in the reponse + // See if all the chunks are OK and put them in the response //-------------------------------------------------------------------------- uint32_t size = 0; for( uint32_t i = 0; i < pChunkList->size(); ++i ) @@ -1532,7 +1532,7 @@ namespace XrdCl if( offset+chunk->rlen+16 > len ) { log->Error( XRootDMsg, "[%s] Handling response to %s: copying " - "requested data would cross message boundry", + "requested data would cross message boundary", pUrl.GetHostId().c_str(), pRequest->GetDescription().c_str() ); return Status( stFatal, errInvalidResponse ); @@ -1597,9 +1597,9 @@ namespace XrdCl //-------------------------------------------------------------------------- // Nothing can be done if: - // 1) a user timeout has occured + // 1) a user timeout has occurred // 2) has a non-zero session id - // 3) if another error occured and the validity of the message expired + // 3) if another error occurred and the validity of the message expired //-------------------------------------------------------------------------- if( status.code == errOperationExpired || pRequest->GetSessionId() || time(0) >= pExpiration ) diff --git a/src/XrdCl/XrdClXRootDMsgHandler.hh b/src/XrdCl/XrdClXRootDMsgHandler.hh index 0ce16884396..5c13ce691d8 100644 --- a/src/XrdCl/XrdClXRootDMsgHandler.hh +++ b/src/XrdCl/XrdClXRootDMsgHandler.hh @@ -102,7 +102,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Examine an incomming message, and decide on the action to be taken + //! Examine an incoming message, and decide on the action to be taken //! //! @param msg the message, may be zero if receive failed //! @return action type that needs to be take wrt the message and @@ -232,7 +232,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Set the redirect coutner + //! Set the redirect counter //------------------------------------------------------------------------ void SetRedirectCounter( uint16_t redirectCounter ) { @@ -300,7 +300,7 @@ namespace XrdCl Status RewriteRequestRedirect( const URL::ParamsMap &newCgi ); //------------------------------------------------------------------------ - //! Some requests need to be rewriten also after getting kXR_wait - sigh + //! Some requests need to be rewritten also after getting kXR_wait - sigh //------------------------------------------------------------------------ Status RewriteRequestWait(); diff --git a/src/XrdCl/XrdClXRootDResponses.hh b/src/XrdCl/XrdClXRootDResponses.hh index bfbde25d646..88776877d93 100644 --- a/src/XrdCl/XrdClXRootDResponses.hh +++ b/src/XrdCl/XrdClXRootDResponses.hh @@ -336,8 +336,8 @@ namespace XrdCl Other = kXR_other, //!< Neither a file nor a directory Offline = kXR_offline, //!< File is not online (ie. on disk) POSCPending = kXR_poscpend, //!< File opened with POST flag, not yet - //!< successfuly closed - IsReadable = kXR_readable, //!< Read access is alowed + //!< successfully closed + IsReadable = kXR_readable, //!< Read access is allowed IsWritable = kXR_writable //!< Write access is allowed }; @@ -435,7 +435,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Get size of the largest contiguous aread of free r/w space (in MB) + //! Get size of the largest contiguous area of free r/w space (in MB) //------------------------------------------------------------------------ uint64_t GetFreeRW() const { @@ -459,7 +459,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - //! Get size of the largest contiguous aread of free staging space (in MB) + //! Get size of the largest contiguous area of free staging space (in MB) //------------------------------------------------------------------------ uint64_t GetFreeStaging() const { diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc index 2fced2fc269..3da967dc1d3 100644 --- a/src/XrdCl/XrdClXRootDTransport.cc +++ b/src/XrdCl/XrdClXRootDTransport.cc @@ -236,7 +236,7 @@ namespace XrdCl { Log *log = DefaultEnv::GetLog(); log->Error( XRootDTransportMsg, - "[%s] Iternal error: not enough substreams", + "[%s] Internal error: not enough substreams", handShakeData->streamName.c_str() ); return Status( stFatal, errInternal ); } @@ -373,7 +373,7 @@ namespace XrdCl //-------------------------------------------------------------------------- // Second step - we got the reply message to the initial handshake, - // if successfull we need to send bind + // if successful we need to send bind //-------------------------------------------------------------------------- if( sInfo.status == XRootDStreamInfo::HandShakeSent ) { @@ -664,13 +664,13 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Unmarshal the request - sometimes the requests need to be rewritten, + // Unmarshall the request - sometimes the requests need to be rewritten, // so we need to unmarshall them //---------------------------------------------------------------------------- Status XRootDTransport::UnMarshallRequest( Message *msg ) { - // We rely on the marshaling process to be symetric! - // First we unmarshal the request ID and the length because + // We rely on the marshaling process to be symmetric! + // First we unmarshall the request ID and the length because // MarshallRequest() relies on these, and then we need to unmarshall these // two again, because they get marshalled in MarshallRequest(). // All this is pretty damn ugly and should be rewritten. @@ -684,7 +684,7 @@ namespace XrdCl } //---------------------------------------------------------------------------- - // Unmarshall the body of the incomming message + // Unmarshall the body of the incoming message //---------------------------------------------------------------------------- Status XRootDTransport::UnMarshallBody( Message *msg, uint16_t reqType ) { @@ -742,7 +742,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - // Unmarshall the header of the incomming message + // Unmarshall the header of the incoming message //------------------------------------------------------------------------ void XRootDTransport::UnMarshallHeader( Message *msg ) { @@ -834,7 +834,7 @@ namespace XrdCl } //------------------------------------------------------------------------ - // Check whether the transport can highjack the message + // Check whether the transport can hijack the message //------------------------------------------------------------------------ uint32_t XRootDTransport::StreamAction( Message *msg, AnyObject &channelData ) { @@ -1693,7 +1693,7 @@ namespace XrdCl default: o << sreq->infotype; break; } o << ", "; - o << "arg lenght: " << sreq->dlen << ")"; + o << "arg length: " << sreq->dlen << ")"; break; } diff --git a/src/XrdCl/XrdClXRootDTransport.hh b/src/XrdCl/XrdClXRootDTransport.hh index 848a8fd49d9..e427a1a2c76 100644 --- a/src/XrdCl/XrdClXRootDTransport.hh +++ b/src/XrdCl/XrdClXRootDTransport.hh @@ -56,9 +56,9 @@ namespace XrdCl //------------------------------------------------------------------------ //! Read a message header from the socket, the socket is non-blocking, - //! so if there is not enough data the function should retutn errRetry + //! so if there is not enough data the function should return errRetry //! in which case it will be called again when more data arrives, with - //! the data previousely read stored in the message buffer + //! the data previously read stored in the message buffer //! //! @param message the message buffer //! @param socket the socket @@ -149,18 +149,18 @@ namespace XrdCl static Status MarshallRequest( Message *msg ); //------------------------------------------------------------------------ - //! Unmarshal the request - sometimes the requests need to be rewritten, + //! Unmarshall the request - sometimes the requests need to be rewritten, //! so we need to unmarshall them //------------------------------------------------------------------------ static Status UnMarshallRequest( Message *msg ); //------------------------------------------------------------------------ - //! Unmarshal the body of the incomming message + //! Unmarshall the body of the incoming message //------------------------------------------------------------------------ static Status UnMarshallBody( Message *msg, uint16_t reqType ); //------------------------------------------------------------------------ - //! Unmarshal the header incomming message + //! Unmarshall the header incoming message //------------------------------------------------------------------------ static void UnMarshallHeader( Message *msg ); diff --git a/tests/XrdClTests/TestEnv.cc b/tests/XrdClTests/TestEnv.cc index 1f230c81dde..654bf15f7a5 100644 --- a/tests/XrdClTests/TestEnv.cc +++ b/tests/XrdClTests/TestEnv.cc @@ -34,7 +34,7 @@ TestEnv::TestEnv() PutString( "DataPath", "/data" ); PutString( "RemoteFile", "/data/cb4aacf1-6f28-42f2-b68a-90a73460f424.dat" ); PutString( "LocalFile", "/data/testFile.dat" ); - PutString( "MultiIPServeURL", "multiip:1099" ); + PutString( "MultiIPServerURL", "multiip:1099" ); ImportString( "MainServerURL", "XRDTEST_MAINSERVERURL" ); ImportString( "DiskServerURL", "XRDTEST_DISKSERVERURL" );