From bf46b8db6092eab0fe23bce179ed6bd62e598da0 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Oct 20 2022 11:51:31 +0000 Subject: Update to version 5.5.1 Drop doxygen patch accepted upstream Check all sizes (8, 16, 32, 64) in check Check operator++ in check --- diff --git a/0001-Address-some-warnings-from-Doxygen.patch b/0001-Address-some-warnings-from-Doxygen.patch deleted file mode 100644 index ea2da11..0000000 --- a/0001-Address-some-warnings-from-Doxygen.patch +++ /dev/null @@ -1,2134 +0,0 @@ -From f8f127d2672cc388fe336496748c290f1dbbf35b Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Sun, 28 Aug 2022 12:06:59 +0200 -Subject: [PATCH] Address some warnings from Doxygen - ---- - src/Xrd/XrdLink.hh | 16 ++- - src/Xrd/XrdLinkCtl.hh | 10 +- - src/Xrd/XrdTcpMonPin.hh | 2 + - .../XrdClRecordPlugin/XrdClRecorder.hh | 2 +- - src/XrdCks/XrdCksLoader.hh | 2 +- - src/XrdCks/XrdCksWrapper.hh | 2 +- - src/XrdCl/XrdClArg.hh | 8 +- - src/XrdCl/XrdClAsyncHSWriter.hh | 1 - - src/XrdCl/XrdClAsyncPageReader.hh | 6 +- - src/XrdCl/XrdClChannel.hh | 7 +- - src/XrdCl/XrdClFile.hh | 5 +- - src/XrdCl/XrdClFileOperations.hh | 8 +- - src/XrdCl/XrdClFileStateHandler.hh | 1 - - src/XrdCl/XrdClLocalFileHandler.hh | 8 +- - src/XrdCl/XrdClLog.hh | 2 +- - src/XrdCl/XrdClMetalinkRedirector.hh | 2 +- - src/XrdCl/XrdClOperationHandlers.hh | 12 +-- - src/XrdCl/XrdClOperations.hh | 16 +-- - src/XrdCl/XrdClPostMasterInterfaces.hh | 3 +- - src/XrdCl/XrdClSocket.hh | 11 +- - src/XrdCl/XrdClXCpCtx.hh | 2 +- - src/XrdCl/XrdClXCpSrc.hh | 2 +- - src/XrdCl/XrdClXRootDMsgHandler.hh | 9 +- - src/XrdCl/XrdClZipArchive.hh | 1 - - src/XrdCl/XrdClZipOperations.hh | 2 +- - src/XrdCms/XrdCmsUtils.hh | 2 +- - src/XrdEc/XrdEcRedundancyProvider.hh | 8 +- - src/XrdNet/XrdNetCache.hh | 2 +- - src/XrdNet/XrdNetIF.hh | 4 +- - src/XrdNet/XrdNetMsg.hh | 6 +- - src/XrdNet/XrdNetUtils.hh | 15 ++- - src/XrdOfs/XrdOfsCPFile.hh | 4 +- - src/XrdOfs/XrdOfsConfigPI.hh | 2 +- - src/XrdOfs/XrdOfsHandle.cc | 2 +- - src/XrdOfs/XrdOfsPrepare.hh | 2 +- - src/XrdOss/XrdOss.hh | 26 ++--- - src/XrdOss/XrdOssAt.hh | 2 +- - src/XrdOss/XrdOssStatInfo.hh | 56 +++++----- - src/XrdOss/XrdOssWrapper.hh | 21 ++-- - src/XrdOuc/XrdOucBackTrace.hh | 2 +- - src/XrdOuc/XrdOucBuffer.hh | 2 +- - src/XrdOuc/XrdOucCRC.hh | 4 +- - src/XrdOuc/XrdOucCache.hh | 24 +++-- - src/XrdOuc/XrdOucERoute.hh | 2 +- - src/XrdOuc/XrdOucErrInfo.hh | 2 - - src/XrdOuc/XrdOucFileInfo.hh | 2 +- - src/XrdOuc/XrdOucGMap.hh | 10 +- - src/XrdOuc/XrdOucGatherConf.hh | 2 +- - src/XrdOuc/XrdOucPgrwUtils.hh | 4 +- - src/XrdOuc/XrdOucPinKing.hh | 8 +- - src/XrdOuc/XrdOucVerName.hh | 2 +- - src/XrdPosix/XrdPosixCache.hh | 6 +- - src/XrdPosix/XrdPosixXrootd.hh | 3 - - src/XrdPss/XrdPss.hh | 2 +- - src/XrdRmc/XrdRmc.hh | 100 +++++++++--------- - src/XrdSec/XrdSecInterface.hh | 14 +-- - src/XrdSec/XrdSecProtect.hh | 4 +- - src/XrdSecsss/XrdSecsssID.hh | 6 +- - src/XrdSfs/XrdSfsGPFile.hh | 4 +- - src/XrdSfs/XrdSfsInterface.hh | 48 ++++----- - src/XrdSsi/XrdSsiLogger.hh | 4 +- - src/XrdSsi/XrdSsiRequest.hh | 4 +- - src/XrdSsi/XrdSsiResponder.hh | 2 +- - src/XrdSsi/XrdSsiService.hh | 8 +- - src/XrdSsi/XrdSsiShMap.hh | 4 +- - src/XrdSys/XrdSysLogPI.hh | 2 +- - src/XrdSys/XrdSysLogger.hh | 2 +- - src/XrdSys/XrdSysXAttr.hh | 2 +- - src/XrdTls/XrdTls.hh | 4 +- - src/XrdTls/XrdTlsSocket.hh | 2 +- - src/XrdXrootd/XrdXrootdBridge.hh | 12 +-- - src/XrdXrootd/XrdXrootdGPFile.hh | 2 +- - 72 files changed, 288 insertions(+), 303 deletions(-) - -diff --git a/src/Xrd/XrdLink.hh b/src/Xrd/XrdLink.hh -index 0b167fa30..3d11e9d68 100644 ---- a/src/Xrd/XrdLink.hh -+++ b/src/Xrd/XrdLink.hh -@@ -153,7 +153,7 @@ static XrdLink *Find(int &curr, XrdLinkMatch *who=0); - //----------------------------------------------------------------------------- - //! Find the next client name matching certain attributes. - //! --//! @param cur Is an internal tracking value that allows repeated calls. -+//! @param curr Is an internal tracking value that allows repeated calls. - //! It must be set to a value of 0 or less on the initial call - //! and not touched therafter unless zero is returned. - //! @param bname Pointer to a buffer where the name is to be returned. -@@ -306,7 +306,8 @@ int Recv(char *buff, int blen, int timeout); - //! - //! @param iov pointer to the message vector. - //! @param iocnt number of iov elements in the vector. --//! @param bytes the sum of the sizes in the vector. -+//! @param timeout milliseconds to wait for data. A negative value waits -+//! forever. - //! - //! @return >=0 number of bytes read. - //! < 0 an error occurred or when -ETIMEDOUT is returned, no data -@@ -336,9 +337,9 @@ int RecvAll(char *buff, int blen, int timeout=-1); - //------------------------------------------------------------------------------ - //! Register a host name with this IP address. This is not MT-safe! - //! --//! @param hName -> to a true host name which should be fully qualified. --//! One of the IP addresses registered to this name must --//! match the IP address associated with this object. -+//! @param hName pointer to a true host name which should be fully qualified. -+//! One of the IP addresses registered to this name must -+//! match the IP address associated with this object. - //! - //! @return True: Specified name is now associated with this link. - //! False: Nothing changed, registration could not be verified. -@@ -479,7 +480,7 @@ bool setTLS(bool enable, XrdTlsContext *ctx=0); - //----------------------------------------------------------------------------- - //! Shutdown the link but otherwise keep it intact. - //! --//! @param getlock if true, the operation is performed under a lock. -+//! @param getLock if true, the operation is performed under a lock. - //----------------------------------------------------------------------------- - - void Shutdown(bool getLock); -@@ -555,9 +556,6 @@ bool hasBridge() const {return isBridged;} - //----------------------------------------------------------------------------- - //! Determine if this link is using TLS. - //! --//! @param vprot if not nil, the TLS protocol version number if returned. --//! If the link is not using TLS the version is a null string. --//! - //! @return true this link is using TLS. - //! @return false this link not using TLS. - //----------------------------------------------------------------------------- -diff --git a/src/Xrd/XrdLinkCtl.hh b/src/Xrd/XrdLinkCtl.hh -index 9a20aca8f..1fee8ac5d 100644 ---- a/src/Xrd/XrdLinkCtl.hh -+++ b/src/Xrd/XrdLinkCtl.hh -@@ -110,7 +110,7 @@ static XrdPollInfo *fd2PollInfo(int fd) - //----------------------------------------------------------------------------- - //! Find the next link matching certain attributes. - //! --//! @param cur Is an internal tracking value that allows repeated calls. -+//! @param curr Is an internal tracking value that allows repeated calls. - //! It must be set to a value of 0 or less on the initial call - //! and not touched therafter unless a null pointer is returned. - //! @param who If the object use to check if teh link matches the wanted -@@ -128,7 +128,7 @@ static XrdLink *Find(int &curr, XrdLinkMatch *who=0); - //----------------------------------------------------------------------------- - //! Find the next client name matching certain attributes. - //! --//! @param cur Is an internal tracking value that allows repeated calls. -+//! @param curr Is an internal tracking value that allows repeated calls. - //! It must be set to a value of 0 or less on the initial call - //! and not touched therafter unless zero is returned. - //! @param bname Pointer to a buffer where the name is to be returned. -@@ -152,8 +152,8 @@ static void idleScan(); - //----------------------------------------------------------------------------- - //! Set kill constants. - //! --//! @param wksec Seconds to wait for kill to happed, --//! @param kwsec The minimum number of seconds to wait after killing a -+//! @param wkSec Seconds to wait for kill to happed, -+//! @param kwSec The minimum number of seconds to wait after killing a - //! connection for it to end. - //----------------------------------------------------------------------------- - -@@ -162,7 +162,7 @@ static void setKWT(int wkSec, int kwSec); - //----------------------------------------------------------------------------- - //! Setup link processing. - //! --//! @param maaxfds The maximum number of connections to handle. -+//! @param maxfds The maximum number of connections to handle. - //! @param idlewt The time interval to check for idle connections. - //! - //! @return !0 Successful. -diff --git a/src/Xrd/XrdTcpMonPin.hh b/src/Xrd/XrdTcpMonPin.hh -index 14bc21660..bdaa83b1c 100644 ---- a/src/Xrd/XrdTcpMonPin.hh -+++ b/src/Xrd/XrdTcpMonPin.hh -@@ -37,7 +37,9 @@ - object exists in the environment. You get the g-stream object specific - to this plugin by executing the following (assume envR is the environment): - -+ @code {.cpp} - XrdXrootdGStream *gS = (XrdXrootdGStream *)envR.GetPtr("TcpMon.gStream*"); -+ @endcode - */ - - class XrdTcpMonPin -diff --git a/src/XrdApps/XrdClRecordPlugin/XrdClRecorder.hh b/src/XrdApps/XrdClRecordPlugin/XrdClRecorder.hh -index 390d15b44..c9eb2052b 100644 ---- a/src/XrdApps/XrdClRecordPlugin/XrdClRecorder.hh -+++ b/src/XrdApps/XrdClRecordPlugin/XrdClRecorder.hh -@@ -221,7 +221,7 @@ public: - - //---------------------------------------------------------------------------- - //! Create the output csv file -- //! @param path : path for the file to be created -+ //! @param cfgpath : path for the file to be created - //---------------------------------------------------------------------------- - inline static void SetOutput( const std::string &cfgpath ) - { -diff --git a/src/XrdCks/XrdCksLoader.hh b/src/XrdCks/XrdCksLoader.hh -index 09e9bc2d1..7293cb3d9 100644 ---- a/src/XrdCks/XrdCksLoader.hh -+++ b/src/XrdCks/XrdCksLoader.hh -@@ -50,7 +50,7 @@ public: - //! and md5 checksums are natively supported. Up to five more checksum - //! algorithms can be loaded from shared libraries. - //! --//! @param csNme The name of the checksum algorithm (e.g. md5). -+//! @param csName The name of the checksum algorithm (e.g. md5). - //! @param csParms Any parameters that might be needed by the checksum - //! algorithm should it be loaded from a shared library. - //! @param eBuff Optional pointer to a buffer to receive the reason for a -diff --git a/src/XrdCks/XrdCksWrapper.hh b/src/XrdCks/XrdCksWrapper.hh -index 0fb38c668..dc87f552c 100644 ---- a/src/XrdCks/XrdCksWrapper.hh -+++ b/src/XrdCks/XrdCksWrapper.hh -@@ -233,7 +233,7 @@ int Ver( const char *Xfn, XrdCksData &Cks, XrdCksPCB *pcbP) - //! Constructor - //! - //! @param prevPI Reference to the antecedent plugin. --//! Wparam errP Pointer to error message object -+//! @param errP Pointer to error message object - //------------------------------------------------------------------------------ - - XrdCksWrapper(XrdCks &prevPI, XrdSysError *errP) -diff --git a/src/XrdCl/XrdClArg.hh b/src/XrdCl/XrdClArg.hh -index 49233f9eb..3ff9fce9f 100644 ---- a/src/XrdCl/XrdClArg.hh -+++ b/src/XrdCl/XrdClArg.hh -@@ -163,7 +163,7 @@ namespace XrdCl - //-------------------------------------------------------------------- - //! Constructor - //! -- //! @param value : the future value to be hold by us -+ //! @param ftr : the future value to be hold by us - //-------------------------------------------------------------------- - FutureValue( std::future &&ftr ) : ftr( std::move( ftr ) ) - { -@@ -195,7 +195,7 @@ namespace XrdCl - //-------------------------------------------------------------------- - //! Constructor - //! -- //! @param value : the forwarded value to be hold by us -+ //! @param fwd : the forwarded value to be hold by us - //-------------------------------------------------------------------- - FwdValue( const Fwd &fwd ) : fwd( fwd ) - { -@@ -305,7 +305,7 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Constructor. - //! -- //! @param value : value of the argument -+ //! @param str : value of the argument - //------------------------------------------------------------------------ - Arg( std::string str ) : ArgBase( str ) - { -@@ -314,7 +314,7 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Constructor. - //! -- //! @param val : value of the argument -+ //! @param cstr : value of the argument - //------------------------------------------------------------------------ - Arg( const char *cstr ) : ArgBase( cstr ) - { -diff --git a/src/XrdCl/XrdClAsyncHSWriter.hh b/src/XrdCl/XrdClAsyncHSWriter.hh -index 4f036d8e2..c1bd52d63 100644 ---- a/src/XrdCl/XrdClAsyncHSWriter.hh -+++ b/src/XrdCl/XrdClAsyncHSWriter.hh -@@ -41,7 +41,6 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Constructor - //! -- //! @param xrdTransport : the (xrootd) transport layer - //! @param socket : the socket with the message to be read out - //! @param strmname : stream name - //------------------------------------------------------------------------ -diff --git a/src/XrdCl/XrdClAsyncPageReader.hh b/src/XrdCl/XrdClAsyncPageReader.hh -index 5dc246a99..1a02b2cc0 100644 ---- a/src/XrdCl/XrdClAsyncPageReader.hh -+++ b/src/XrdCl/XrdClAsyncPageReader.hh -@@ -42,10 +42,7 @@ class AsyncPageReader - //! Constructor - //! - //! @param chunks : list of buffer for the data -- //! @param socket : the socket with the data - //! @param digests : a vector that will be filled with crc32c digest data -- //! @param dlen : total size of data (including crc32 digests) in the -- //! server response - //-------------------------------------------------------------------------- - AsyncPageReader( ChunkList &chunks, - std::vector &digests ) : -@@ -100,7 +97,8 @@ class AsyncPageReader - } - - //-------------------------------------------------------------------------- -- //! Readout date from the socket -+ //! Readout data from the socket -+ //! @param socket : the socket with the data - //! @param btsread : number of user data read from the socket - //! @return : operation status - //-------------------------------------------------------------------------- -diff --git a/src/XrdCl/XrdClChannel.hh b/src/XrdCl/XrdClChannel.hh -index 70c9cd80e..0bd947482 100644 ---- a/src/XrdCl/XrdClChannel.hh -+++ b/src/XrdCl/XrdClChannel.hh -@@ -83,16 +83,15 @@ namespace XrdCl - //! pushed through the wire or when the timeout elapses - //! - //! @param msg message to be sent -- //! @apram stateful physical stream disconnection causes an error -+ //! @param handler handler to be notified about the status -+ //! @param stateful physical stream disconnection causes an error - //! @param expires unix timestamp after which a failure is reported - //! to the listener -- //! @param handler handler to be notified about the status -- //! @param redirector virtual redirector to be used - //! @return success if the message was successfully inserted - //! into the send queues, failure otherwise - //------------------------------------------------------------------------ - XRootDStatus Send( Message *msg, -- MsgHandler *handler, -+ MsgHandler *handler, - bool stateful, - time_t expires ); - -diff --git a/src/XrdCl/XrdClFile.hh b/src/XrdCl/XrdClFile.hh -index 4f1a0caf0..db9fbc0e4 100644 ---- a/src/XrdCl/XrdClFile.hh -+++ b/src/XrdCl/XrdClFile.hh -@@ -218,8 +218,8 @@ namespace XrdCl - //! @param offset offset from the beginning of the file - //! @param size buffer size, at least 1 page big (4KB) - //! @param buffer a pointer to a buffer big enough to hold the data -- //! @param bytesRead number of bytes actually read - //! @param cksums crc32c checksum for each read 4KB page -+ //! @param bytesRead number of bytes actually read - //! @param timeout timeout value, if 0 the environment default will be - //! used - //! @return status of the operation -@@ -525,7 +525,6 @@ namespace XrdCl - //! @param offset offset from the beginning of the file - //! @param iov list of the buffers to - //! @param iovcnt number of buffers -- //! @param handler handler to be notified when the response arrives - //! @param timeout timeout value, if 0 then the environment default - //! will be used - //! @return status of the operation -@@ -558,7 +557,7 @@ namespace XrdCl - //! @param offset offset from the beginning of the file - //! @param iov list of the buffers to be written - //! @param iovcnt number of buffers -- //! @param handler handler to be notified when the response arrives -+ //! @param bytesRead number of bytes actually read - //! @param timeout timeout value, if 0 then the environment default - //! will be used - //! @return status of the operation -diff --git a/src/XrdCl/XrdClFileOperations.hh b/src/XrdCl/XrdClFileOperations.hh -index 8252c4fbb..ace617794 100644 ---- a/src/XrdCl/XrdClFileOperations.hh -+++ b/src/XrdCl/XrdClFileOperations.hh -@@ -154,7 +154,7 @@ namespace XrdCl - //! - //! @arg from : state from which the object is being converted - //! -- //! @param op : the object that is being converted -+ //! @param open : the object that is being converted - //------------------------------------------------------------------------ - template - OpenImpl( OpenImpl && open ) : -@@ -173,7 +173,7 @@ namespace XrdCl - //! Overload of operator>> defined in ConcreteOperation, we're adding - //! additional capabilities by using ExResp factory (@see ExResp). - //! -- //! @param func : function/functor/lambda -+ //! @param hdlr : function/functor/lambda - //------------------------------------------------------------------------ - template - OpenImpl operator>>( Hdlr &&hdlr ) -@@ -195,8 +195,8 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! RunImpl operation (@see Operation) - //! -- //! @param timeout : pipeline timeout -- //! @return : status of the operation -+ //! @param pipelineTimeout : pipeline timeout -+ //! @return : status of the operation - //------------------------------------------------------------------------ - XRootDStatus RunImpl( PipelineHandler *handler, uint16_t pipelineTimeout ) - { -diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh -index 923198dbd..197151321 100644 ---- a/src/XrdCl/XrdClFileStateHandler.hh -+++ b/src/XrdCl/XrdClFileStateHandler.hh -@@ -331,7 +331,6 @@ namespace XrdCl - //! @param offset offset from the beginning of the file - //! @param size buffer size - //! @param buffer a pointer to a buffer holding data pages -- //! @param cksums the crc32c checksums for each 4KB page - //! @param handler handler to be notified when the response arrives - //! @param timeout timeout value, if 0 the environment default will be - //! used -diff --git a/src/XrdCl/XrdClLocalFileHandler.hh b/src/XrdCl/XrdClLocalFileHandler.hh -index e04a6a7e0..461433a94 100644 ---- a/src/XrdCl/XrdClLocalFileHandler.hh -+++ b/src/XrdCl/XrdClLocalFileHandler.hh -@@ -179,8 +179,7 @@ namespace XrdCl - //! Write scattered buffers in one operation - async - //! - //! @param offset offset from the beginning of the file -- //! @param iov list of the buffers to be written -- //! @param iovcnt number of buffers -+ //! @param chunks list of the chunks to be read - //! @param handler handler to be notified when the response arrives - //! @param timeout timeout value, if 0 then the environment default - //! will be used -@@ -292,10 +291,9 @@ namespace XrdCl - uint16_t timeout = 0 ); - - //------------------------------------------------------------------------ -- //! creates the directories specified in file_path -+ //! creates the directories specified in path - //! -- //! @param file_path specifies which directories are to be created -- //! @param mode same access modes as for the desired file operation -+ //! @param path specifies which directories are to be created - //! @return status of the mkdir system call - //------------------------------------------------------------------------ - static XRootDStatus MkdirPath( const std::string &path ); -diff --git a/src/XrdCl/XrdClLog.hh b/src/XrdCl/XrdClLog.hh -index 3b4b50a77..bd06d4277 100644 ---- a/src/XrdCl/XrdClLog.hh -+++ b/src/XrdCl/XrdClLog.hh -@@ -161,7 +161,7 @@ namespace XrdCl - //! Always print the message - //! - //! @param level log level -- //! @param type topic of the message -+ //! @param topic topic of the message - //! @param format format string - the same as in printf - //! @param list list of arguments - //------------------------------------------------------------------------ -diff --git a/src/XrdCl/XrdClMetalinkRedirector.hh b/src/XrdCl/XrdClMetalinkRedirector.hh -index 62fab2e80..c8c31da79 100644 ---- a/src/XrdCl/XrdClMetalinkRedirector.hh -+++ b/src/XrdCl/XrdClMetalinkRedirector.hh -@@ -37,7 +37,6 @@ class MetalinkRedirector : public VirtualRedirector - //---------------------------------------------------------------------------- - //! Constructor - //! @param url : URL to the metalink file -- //! @param userHandler : the response handler provided by end user - //---------------------------------------------------------------------------- - MetalinkRedirector( const std::string &url ); - -@@ -48,6 +47,7 @@ class MetalinkRedirector : public VirtualRedirector - - //---------------------------------------------------------------------------- - //! Initializes the object with the content of the metalink file -+ //! @param userHandler : the response handler provided by end user - //---------------------------------------------------------------------------- - XRootDStatus Load( ResponseHandler *userHandler ); - -diff --git a/src/XrdCl/XrdClOperationHandlers.hh b/src/XrdCl/XrdClOperationHandlers.hh -index 7af15cd80..96af09fc9 100644 ---- a/src/XrdCl/XrdClOperationHandlers.hh -+++ b/src/XrdCl/XrdClOperationHandlers.hh -@@ -620,8 +620,8 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! A factory method, simply forwards the given handler - //! -- //! @param h : the ResponseHandler that should be wrapped -- //! @return : a ForwardingHandler instance -+ //! @param hdlr : the ResponseHandler that should be wrapped -+ //! @return : a ForwardingHandler instance - //------------------------------------------------------------------------ - inline static ResponseHandler* Create( ResponseHandler *hdlr ) - { -@@ -631,8 +631,8 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! A factory method, simply forwards the given handler - //! -- //! @param h : the ResponseHandler that should be wrapped -- //! @return : a ForwardingHandler instance -+ //! @param hdlr : the ResponseHandler that should be wrapped -+ //! @return : a ForwardingHandler instance - //------------------------------------------------------------------------ - inline static ResponseHandler* Create( ResponseHandler &hdlr ) - { -@@ -687,7 +687,7 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! A factory method - //! -- //! @param func : the task that should be wrapped -+ //! @param task : the task that should be wrapped - //! @return : TaskWrapper instance - //------------------------------------------------------------------------ - template -@@ -736,7 +736,7 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! A factory method - //! -- //! @param func : the task that should be wrapped -+ //! @param task : the task that should be wrapped - //! @return : TaskWrapper instance - //------------------------------------------------------------------------ - template -diff --git a/src/XrdCl/XrdClOperations.hh b/src/XrdCl/XrdClOperations.hh -index cdf056d0e..24aa66a09 100644 ---- a/src/XrdCl/XrdClOperations.hh -+++ b/src/XrdCl/XrdClOperations.hh -@@ -70,7 +70,6 @@ namespace XrdCl - //! Constructor. - //! - //! @param handler : the handler of our operation -- //! @param recovery : the recovery procedure for our operation - //------------------------------------------------------------------------ - PipelineHandler( ResponseHandler *handler ); - -@@ -244,13 +243,8 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Run operation - //! -- //! @param prom : the promise that we will have a result -+ //! @param prms : the promise that we will have a result - //! @param final : the object to call at the end of pipeline -- //! @param args : forwarded arguments -- //! @param bucket : number of the bucket with arguments -- //! -- //! @return : stOK if operation was scheduled for execution -- //! successfully, stError otherwise - //------------------------------------------------------------------------ - void Run( Timeout timeout, - std::promise prms, -@@ -290,7 +284,6 @@ namespace XrdCl - //! @param params : container with parameters forwarded from - //! previous operation - //! @return : status of the operation -- //! @param bucket : number of the bucket with arguments - //------------------------------------------------------------------------ - virtual XRootDStatus RunImpl( PipelineHandler *handler, uint16_t timeout ) = 0; - -@@ -528,6 +521,7 @@ namespace XrdCl - //! the status - //! - //! @param pipeline : the pipeline to be executed -+ //! @param timeout : the pipeline timeout - //! - //! @return : status of the operation - //---------------------------------------------------------------------------- -@@ -583,7 +577,7 @@ namespace XrdCl - //! Note: due to reference collapsing this covers both l-value and - //! r-value references. - //! -- //! @param func : function/functor/lambda -+ //! @param hdlr : function/functor/lambda - //------------------------------------------------------------------------ - template - Derived operator>>( Hdlr &&hdlr ) -@@ -699,8 +693,8 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Implements operator>> functionality - //! -- //! @param h : handler to be added -- //! @ -+ //! @param handler : handler to be added -+ //! - //! @return : return an instance of Derived - //------------------------------------------------------------------------ - inline Derived StreamImpl( ResponseHandler *handler ) -diff --git a/src/XrdCl/XrdClPostMasterInterfaces.hh b/src/XrdCl/XrdClPostMasterInterfaces.hh -index b567fcb6c..187a9ce58 100644 ---- a/src/XrdCl/XrdClPostMasterInterfaces.hh -+++ b/src/XrdCl/XrdClPostMasterInterfaces.hh -@@ -188,7 +188,7 @@ namespace XrdCl - //! true - only socket related errors may be returned here - //! - //! @param socket the socket to read from -- //! @param bytesRead number of bytes read by the method -+ //! @param bytesWritten number of bytes written by the method - //! @return stOK & suDone if the whole body has been processed - //! stOK & suRetry if more data needs to be written - //! stError on failure -@@ -228,7 +228,6 @@ namespace XrdCl - //! Event callback - //! - //! @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 - //! false if it should be removed from further consideration -diff --git a/src/XrdCl/XrdClSocket.hh b/src/XrdCl/XrdClSocket.hh -index 5b6d5e9f9..19739551c 100644 ---- a/src/XrdCl/XrdClSocket.hh -+++ b/src/XrdCl/XrdClSocket.hh -@@ -160,17 +160,17 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Portable wrapper around SIGPIPE free send - //! -- //! @param buffer : data to be written -- //! @param size : size of the data buffer -- //! @return : the amount of data actually written -+ //! @param buffer : data to be written -+ //! @param size : size of the data buffer -+ //! @param bytesWritten : the amount of data actually written - //------------------------------------------------------------------------ - XRootDStatus Send( const char *buffer, size_t size, int &bytesWritten ); - - //------------------------------------------------------------------------ - //! Write data from a kernel buffer to the socket - //! -- //! @param kbuff : data to be written -- //! @return : the amount of data actually written -+ //! @param kbuff : data to be written -+ //! @param bytesWritten : the amount of data actually written - //------------------------------------------------------------------------ - XRootDStatus Send( XrdSys::KernelBuffer &kbuff, int &bytesWritten ); - -@@ -179,7 +179,6 @@ namespace XrdCl - //! - //! @param msg : message (request) to be sent - //! @param strmname : stream name (for logging purposes) -- //! @return : the amount of data actually written - //------------------------------------------------------------------------ - XRootDStatus Send( Message &msg, const std::string &strmname ); - -diff --git a/src/XrdCl/XrdClXCpCtx.hh b/src/XrdCl/XrdClXCpCtx.hh -index 67c9ced15..5e726420f 100644 ---- a/src/XrdCl/XrdClXCpCtx.hh -+++ b/src/XrdCl/XrdClXCpCtx.hh -@@ -147,7 +147,7 @@ class XCpCtx - * Gets the next chunk from the sink, if the sink is empty blocks. - * - * @param ci : the chunk retrieved from sink (output parameter) -- * @retrun : stError if we failed to transfer the file, -+ * @return : stError if we failed to transfer the file, - * stOK otherwise, with one of the following codes: - * - suDone : the whole file has been transferred, - * we are done -diff --git a/src/XrdCl/XrdClXCpSrc.hh b/src/XrdCl/XrdClXCpSrc.hh -index d8c2e687f..50e9ee437 100644 ---- a/src/XrdCl/XrdClXCpSrc.hh -+++ b/src/XrdCl/XrdClXCpSrc.hh -@@ -218,7 +218,7 @@ class XCpSrc - * This method is used by ChunkHandler to report the result of a write, - * to the source object. - * -- * @param stats : operation status -+ * @param status : operation status - * @param chunk : the read chunk (if operation failed, should be null) - * @param handle : the file object used to read the chunk - */ -diff --git a/src/XrdCl/XrdClXRootDMsgHandler.hh b/src/XrdCl/XrdClXRootDMsgHandler.hh -index 73c90edf2..ea9c35176 100644 ---- a/src/XrdCl/XrdClXRootDMsgHandler.hh -+++ b/src/XrdCl/XrdClXRootDMsgHandler.hh -@@ -282,7 +282,6 @@ namespace XrdCl - //! Handle an event other that a message arrival - //! - //! @param event type of the event -- //! @param streamNum stream concerned - //! @param status status info - //------------------------------------------------------------------------ - virtual uint8_t OnStreamEvent( StreamEvent event, -@@ -304,7 +303,7 @@ namespace XrdCl - //! true - only socket related errors may be returned here - //! - //! @param socket the socket to read from -- //! @param bytesRead number of bytes read by the method -+ //! @param bytesWritten number of bytes written by the method - //! @return stOK & suDone if the whole body has been processed - //! stOK & suRetry if more data needs to be written - //! stError on failure -@@ -510,7 +509,7 @@ namespace XrdCl - //! Check if for given request and Metalink redirector it is OK to omit - //! the kXR_wait and proceed stright to the next entry in the Metalink file - //! -- //! @param reuqest : the request in question -+ //! @param request : the request in question - //! @param url : metalink URL - //! @return : true if yes, false if no - //------------------------------------------------------------------------ -@@ -533,7 +532,7 @@ namespace XrdCl - //! Read data from buffer - //! - //! @param buffer : the buffer with data -- //! @param size : the size of the buffer -+ //! @param buflen : the size of the buffer - //! @param result : output parameter (data read) - //! @return : status of the operation - //------------------------------------------------------------------------ -@@ -544,7 +543,7 @@ namespace XrdCl - //! Read a string from buffer - //! - //! @param buffer : the buffer with data -- //! @param size : the size of the buffer -+ //! @param buflen : the size of the buffer - //! @param result : output parameter (data read) - //! @return : status of the operation - //------------------------------------------------------------------------ -diff --git a/src/XrdCl/XrdClZipArchive.hh b/src/XrdCl/XrdClZipArchive.hh -index 24fb0c381..d0ed61a27 100644 ---- a/src/XrdCl/XrdClZipArchive.hh -+++ b/src/XrdCl/XrdClZipArchive.hh -@@ -395,7 +395,6 @@ namespace XrdCl - //----------------------------------------------------------------------- - //! Append data to a new file, implementation - //! -- //! @param lfh : the Local File Header record - //! @param size : number of bytes to be appended - //! @param buffer : the buffer with the data to be appended - //! @param handler : user callback -diff --git a/src/XrdCl/XrdClZipOperations.hh b/src/XrdCl/XrdClZipOperations.hh -index dd848dc14..7bf7a4133 100644 ---- a/src/XrdCl/XrdClZipOperations.hh -+++ b/src/XrdCl/XrdClZipOperations.hh -@@ -33,7 +33,7 @@ namespace XrdCl - //------------------------------------------------------------------------ - //! Constructor - //! -- //! @param f : file on which the operation will be performed -+ //! @param zip : file on which the operation will be performed - //! @param args : file operation arguments - //------------------------------------------------------------------------ - ZipOperation( Ctx zip, Arguments... args): ConcreteOperation( std::move( args )... ), zip( std::move( zip ) ) -diff --git a/src/XrdCms/XrdCmsUtils.hh b/src/XrdCms/XrdCmsUtils.hh -index e21e6b283..0a9d2e6b9 100644 ---- a/src/XrdCms/XrdCmsUtils.hh -+++ b/src/XrdCms/XrdCmsUtils.hh -@@ -88,7 +88,7 @@ bool ParseMan(XrdSysError *eDest, XrdOucTList **oldMans, - //! Obtain the port for a manager specification - //! - //! @param eDest Pointer to the error message object to route messages. --//! @param oldMans The configuration file stream. -+//! @param CFile The configuration file stream. - //! @param hSpec The initial manager specification which may or may not - //! have the port number in it. - //! -diff --git a/src/XrdEc/XrdEcRedundancyProvider.hh b/src/XrdEc/XrdEcRedundancyProvider.hh -index 1a942d5c6..b8724b02a 100644 ---- a/src/XrdEc/XrdEcRedundancyProvider.hh -+++ b/src/XrdEc/XrdEcRedundancyProvider.hh -@@ -1,5 +1,5 @@ - //------------------------------------------------------------------------------ --//! @file RedundancyProvider.hh -+//! @file XrdEcRedundancyProvider.hh - //! @author Paul Hermann Lensing - //! @brief Class for computing parities and recovering data - //------------------------------------------------------------------------------ -@@ -45,7 +45,7 @@ namespace XrdEc - //! has to equal nData+nParity. Blocks can be arbitrary size, but size has - //! to be equal within a stripe. Function will throw on incorrect input. - //! -- //! @param stripe nData+nParity blocks, missing (empty) blocks will be -+ //! @param stripes nData+nParity blocks, missing (empty) blocks will be - //! computed if possible. - //-------------------------------------------------------------------------- - void compute( stripes_t &stripes ); -@@ -77,8 +77,8 @@ namespace XrdEc - //! to be correct (crc integrity checks of blocks should be done previously - //! to attempting erasure decoding). - //! -- //! @param stripe vector of nData+nParity blocks, missing (empty) blocks are -- //! errors -+ //! @param stripes vector of nData+nParity blocks, missing (empty) blocks -+ //! are errors - //! @return a string of stripe size describing the error pattern - //-------------------------------------------------------------------------- - std::string getErrorPattern( stripes_t &stripes ) const; -diff --git a/src/XrdNet/XrdNetCache.hh b/src/XrdNet/XrdNetCache.hh -index f17637c1d..ec50ee9f9 100644 ---- a/src/XrdNet/XrdNetCache.hh -+++ b/src/XrdNet/XrdNetCache.hh -@@ -66,7 +66,7 @@ char *Find(XrdNetAddrInfo *hAddr); - //------------------------------------------------------------------------------ - //! Set the default keep time for entries in the cache during initialization. - //! --//! @param ktVal the number of seconds to keep an entry in the cache. -+//! @param ktval the number of seconds to keep an entry in the cache. - //------------------------------------------------------------------------------ - static - void SetKT(int ktval) {keepTime = ktval;} -diff --git a/src/XrdNet/XrdNetIF.hh b/src/XrdNet/XrdNetIF.hh -index 3adbb74d3..b36956622 100644 ---- a/src/XrdNet/XrdNetIF.hh -+++ b/src/XrdNet/XrdNetIF.hh -@@ -224,7 +224,7 @@ inline bool HasDest(ifType ifT=PublicV6) - //------------------------------------------------------------------------------ - //! Determine if an endpoint is this domain based on hostname. - //! --//! @param epAddr Pointer to the endpoint NetAddrInfo object. -+//! @param epaddr Pointer to the endpoint NetAddrInfo object. - //! - //! @result true The endpoint is in this domain. - //! @result false Either the endpoint is not in this domain, is a private -@@ -297,8 +297,6 @@ static void Privatize(ifType &x) {x = ifType(x | PrivateIF);} - //! Set the default assigned port number. - //! - //! @param pnum The port number. --//! --//! @return The previous port number. - //------------------------------------------------------------------------------ - - static void PortDefault(int pnum=1094); -diff --git a/src/XrdNet/XrdNetMsg.hh b/src/XrdNet/XrdNetMsg.hh -index ea3eaac33..61ef9e8a7 100644 ---- a/src/XrdNet/XrdNetMsg.hh -+++ b/src/XrdNet/XrdNetMsg.hh -@@ -58,7 +58,7 @@ public: - //! computed as strlen(buff). - //! @param dest The endpint name which can be host:port or a named socket. - //! If dest is zero, uses dest specified in the constructor. --//! @param timeout maximum seconds to wait for a idle socket. When negative, -+//! @param tmo maximum seconds to wait for a idle socket. When negative, - //! the default, no time limit applies. - //! @return <0 Message not sent due to error. - //! @return =0 Message send (well as defined by UDP) -@@ -78,7 +78,7 @@ int Send(const char *buff, // The data to be send - //! computed as strlen(buff). - //! @param dest The endpoint in the form as in "host:port". - //! @param netSA The endpoint address. This overrides the constructor. --//! @param timeout maximum seconds to wait for a idle socket. When negative, -+//! @param tmo maximum seconds to wait for a idle socket. When negative, - //! the default, no time limit applies. - //! @return <0 Message not sent due to error. - //! @return =0 Message send (well as defined by UDP) -@@ -98,7 +98,7 @@ int Send( const char *dest, // EP: host:port - //! @param iovcnt The number of elements in the vector. - //! @param dest The endpint name which can be host:port or a named socket. - //! If dest is zero, uses dest specified in the constructor. --//! @param timeout maximum seconds to wait for a idle socket. When negative, -+//! @param tmo maximum seconds to wait for a idle socket. When negative, - //! the default, no time limit applies. - //! @return <0 Message not sent due to error. - //! @return =0 Message send (well as defined by UDP) -diff --git a/src/XrdNet/XrdNetUtils.hh b/src/XrdNet/XrdNetUtils.hh -index a0b95cc6b..6a3d4ba40 100644 ---- a/src/XrdNet/XrdNetUtils.hh -+++ b/src/XrdNet/XrdNetUtils.hh -@@ -208,14 +208,14 @@ int GetSokInfo(int fd, char *theAddr, int theALen, char &theType); - //! Obtain an easily digestable list of hosts. This is the list of up to eight - //! unique aliases (i.e. with different addresses) assigned to a base hostname. - //! --//! @param sPort If not nil, the *sPort will be set to hPort if and only if --//! the IP address in one of the entries matches the host --//! address. Otherwise, the value is unchanged. --//! @param hName the host specification suitable for XrdNetAddr.Set(). -+//! @param hSpec the host specification suitable for XrdNetAddr.Set(). - //! @param hPort When >= 0 specified the port to use regardless of hSpec. - //! When < 0 the port must be present in hSpec. --//! hWant Maximum number of list entries wanted. If hWant is greater -+//! @param hWant Maximum number of list entries wanted. If hWant is greater - //! that eight it is set eigth. -+//! @param sPort If not nil, the *sPort will be set to hPort if and only if -+//! the IP address in one of the entries matches the host -+//! address. Otherwise, the value is unchanged. - //! @param eText When not nil, is where to place error message text. - //! - //! @return Success: Pointer to a list of XrdOucTList objects where -@@ -379,7 +379,6 @@ static int Port(int fd, const char **eText=0); - //! Obtain the protocol identifier. - //! - //! @param pName the name of the protocol (e.g. "tcp"). --//! @param eText when not null, the reason for a failure is returned. - //! - //! @return The protocol identifier. - //------------------------------------------------------------------------------ -@@ -404,7 +403,7 @@ static int ServPort(const char *sName, bool isUDP=false, const char **eText=0); - //! used within this class and by XrdNetAddr when the IP mode changes. It is - //! meant for internal use only. - //! --//! @param ipType Is one of the following from the AddrOpts enum: -+//! @param aOpts Is one of the following from the AddrOpts enum: - //! allIPMap - Use IPv6 and mapped IPv4 addrs (default) - //! onlyIPv4 - Use only IPv4 addresses. - //! prefAuto - Determine proper options based on configuration. -@@ -417,7 +416,7 @@ static int SetAuto(AddrOpts aOpts=allIPMap); - //------------------------------------------------------------------------------ - //! Check if whether or not a host name represents more than one unique host. - //! --//! @param hName the host specification suitable for XrdNetAddr.Set(). -+//! @param hSpec the host specification suitable for XrdNetAddr.Set(). - //! @param eText When not nil, is where to place error message text. - //! - //! @return True is this is a simple single host. False if the name represensts -diff --git a/src/XrdOfs/XrdOfsCPFile.hh b/src/XrdOfs/XrdOfsCPFile.hh -index b5eb83b50..592d9f6f7 100644 ---- a/src/XrdOfs/XrdOfsCPFile.hh -+++ b/src/XrdOfs/XrdOfsCPFile.hh -@@ -55,7 +55,7 @@ int Append(const char *data, off_t offset, int dlen); - //----------------------------------------------------------------------------- - //! Create a checkpoint - //! --//! @param srcFN - Pointer to the name of the source file being checkpointed. -+//! @param lfn - Pointer to the name of the source file being checkpointed. - //! @param Stat - Reference to source file stat information. - //! - //! @return 0 upon success and -errno upon failure. -@@ -168,7 +168,7 @@ static char *Target(const char *ckpfn); - //----------------------------------------------------------------------------- - //! Constructor - //! --//! @param ckpfn - Pointer to the name of the checkpoint file to use. When -+//! @param cfn - Pointer to the name of the checkpoint file to use. When - //! supplied, creates are prohibited. - //----------------------------------------------------------------------------- - -diff --git a/src/XrdOfs/XrdOfsConfigPI.hh b/src/XrdOfs/XrdOfsConfigPI.hh -index e7c4c0c67..8cebb1699 100644 ---- a/src/XrdOfs/XrdOfsConfigPI.hh -+++ b/src/XrdOfs/XrdOfsConfigPI.hh -@@ -93,7 +93,7 @@ bool Configure(XrdCmsClient *cmscP, XrdOucEnv *envP); - //----------------------------------------------------------------------------- - //! Configure the fsctl plugin. - //! --//! @param cmsP Pointer to the cms plugin. -+//! @param cmscP Pointer to the cms plugin. - //! @param envP Pointer to the environment. - //----------------------------------------------------------------------------- - -diff --git a/src/XrdOfs/XrdOfsHandle.cc b/src/XrdOfs/XrdOfsHandle.cc -index 0ebec7353..963f17a5a 100644 ---- a/src/XrdOfs/XrdOfsHandle.cc -+++ b/src/XrdOfs/XrdOfsHandle.cc -@@ -71,7 +71,7 @@ public: - int pgWrite(XrdSfsAio* aioparm, uint64_t opts) {return wRC; } - ssize_t Read(off_t, size_t) {return rRC; } - ssize_t Read(void *, off_t, size_t) {return rRC; } -- int Read(XrdSfsAio *aoip) {return rRC; } -+ int Read(XrdSfsAio *aiop) {return rRC; } - ssize_t ReadV(XrdOucIOVec *readV,int rdvcnt) {return rRC; } - ssize_t ReadRaw( void *, off_t, size_t) {return rRC; } - ssize_t Write(const void *, off_t, size_t) {return wRC; } -diff --git a/src/XrdOfs/XrdOfsPrepare.hh b/src/XrdOfs/XrdOfsPrepare.hh -index a8b826c7b..f2b4426bf 100644 ---- a/src/XrdOfs/XrdOfsPrepare.hh -+++ b/src/XrdOfs/XrdOfsPrepare.hh -@@ -178,7 +178,7 @@ extern "C" XrdOfsPrepare_t *XrdOfsgetPrepare; - //! @param parms -> Argument string specified on the namelib directive. It may - //! be null or point to a null string if no parms exist. - //! @param theSfs-> Pointer to the XrdSfsFileSystem plugin. --//! @param theOSs-> Pointer to the OSS plugin. -+//! @param theOss-> Pointer to the OSS plugin. - //! @param envP -> Pointer to environmental information (may be nil). - //! @param prepP -> Pointer to the existing XrdOfsPrepare object that should - //! be wrapped by the returned object. -diff --git a/src/XrdOss/XrdOss.hh b/src/XrdOss/XrdOss.hh -index 1268384f5..e1892ade9 100644 ---- a/src/XrdOss/XrdOss.hh -+++ b/src/XrdOss/XrdOss.hh -@@ -104,7 +104,7 @@ virtual int Readdir(char *buff, int blen) {return -ENOTDIR;} - //! deleted from the target directory are quietly skipped. - //----------------------------------------------------------------------------- - --virtual int StatRet(struct stat *) {return -ENOTSUP;} -+virtual int StatRet(struct stat *buff) {return -ENOTSUP;} - - /******************************************************************************/ - /* F i l e O r i e n t e d M e t h o d s */ -@@ -161,7 +161,7 @@ virtual int Fsync(XrdSfsAio *aiop) {return -EISDIR;} - //! @return 0 upon success or -errno or -osserr (see XrdOssError.hh). - //----------------------------------------------------------------------------- - --virtual int Ftruncate(unsigned long long) {return -EISDIR;} -+virtual int Ftruncate(unsigned long long flen) {return -EISDIR;} - - //----------------------------------------------------------------------------- - //! Return the memory mapped characteristics of the file. -@@ -267,7 +267,7 @@ virtual ssize_t pgWrite(void* buffer, off_t offset, size_t wrlen, - //! (see XrdOssError.hh). - //----------------------------------------------------------------------------- - --virtual int pgWrite(XrdSfsAio* aoiparm, uint64_t opts); -+virtual int pgWrite(XrdSfsAio* aioparm, uint64_t opts); - - //----------------------------------------------------------------------------- - //! Preread file blocks into the file system cache. -@@ -303,7 +303,7 @@ virtual ssize_t Read(void *buffer, off_t offset, size_t size) - //! (see XrdOssError.hh). - //----------------------------------------------------------------------------- - --virtual int Read(XrdSfsAio *aoip) {(void)aoip; return (ssize_t)-EISDIR;} -+virtual int Read(XrdSfsAio *aiop) {(void)aiop; return (ssize_t)-EISDIR;} - - //----------------------------------------------------------------------------- - //! Read uncompressed file bytes into a buffer. -@@ -555,7 +555,8 @@ virtual void Connect(XrdOucEnv &env); - //! @return 0 upon success or -errno or -osserr (see XrdOssError.hh). - //----------------------------------------------------------------------------- - --virtual int Create(const char *, const char *, mode_t, XrdOucEnv &, -+virtual int Create(const char *tid, const char *path, -+ mode_t mode, XrdOucEnv &env, - int opts=0)=0; - - //----------------------------------------------------------------------------- -@@ -652,7 +653,7 @@ virtual int Reloc(const char *tident, const char *path, - //! Remove a directory. - //! - //! @param path - Pointer to the path of the directory to be removed. --//! @param opts - The processing options: -+//! @param Opts - The processing options: - //! XRDOSS_Online - only remove online copy - //! XRDOSS_isPFN - path is already translated. - //! @param envP - Pointer to environmental information. -@@ -711,9 +712,6 @@ virtual int Stats(char *buff, int blen) {(void)buff; (void)blen; return 0; - //! @param buff - Pointer to the buffer to hold the information. - //! @param blen - Length of the buffer. This is updated with the actual - //! number of bytes placed in the buffer as in snprintf(). --//! @param opts - Options: --//! XRDEXP_STAGE - info for stageable space wanted. --//! XRDEXP_NOTRW - info for Read/Only space wanted. - //! @param envP - Pointer to environmental information. - //! - //! @return " " -@@ -730,16 +728,14 @@ virtual int StatFS(const char *path, char *buff, int &blen, - //----------------------------------------------------------------------------- - //! Return filesystem physical space information associated with a space name. - //! -+//! @param env - Ref to environmental information. If the environment -+//! has the key oss.cgroup defined, the associated value is -+//! used as the space name and the path is ignored. - //! @param path - Path in the name space in question. The space name - //! associated with gthe path is used unless overridden. - //! @param buff - Pointer to the buffer to hold the information. - //! @param blen - Length of the buffer. This is updated with the actual - //! number of bytes placed in the buffer as in snprintf(). --//! @param opts - Options (see StatFS()) apply only when there are no --//! spaces defined. --//! @param envP - Ref to environmental information. If the environment --//! has the key oss.cgroup defined, the associated value is --//! used as the space name and the path is ignored. - //! - //! @return "oss.cgroup=&oss.space=&oss.free= - //! &oss.maxf=&oss.used= -@@ -850,7 +846,7 @@ virtual int Truncate(const char *path, unsigned long long fsize, - //! Remove a file. - //! - //! @param path - Pointer to the path of the file to be removed. --//! @param opts - Options: -+//! @param Opts - Options: - //! XRDOSS_isMIG - this is a migratable path. - //! XRDOSS_isPFN - do not apply name2name to path. - //! XRDOSS_Online - remove only the online copy. -diff --git a/src/XrdOss/XrdOssAt.hh b/src/XrdOss/XrdOssAt.hh -index 1207cca93..6bcfb17e6 100644 ---- a/src/XrdOss/XrdOssAt.hh -+++ b/src/XrdOss/XrdOssAt.hh -@@ -131,7 +131,7 @@ int Unlink(XrdOssDF &atDir, const char *path); - //----------------------------------------------------------------------------- - //! Constructor - //! --//! @param ossfd - Reference to the OSS system interface. -+//! @param ossfs - Reference to the OSS system interface. - //----------------------------------------------------------------------------- - - XrdOssAt(XrdOss &ossfs) : ossFS(ossfs) {} -diff --git a/src/XrdOss/XrdOssStatInfo.hh b/src/XrdOss/XrdOssStatInfo.hh -index 6fcb10227..4b72ac0d0 100644 ---- a/src/XrdOss/XrdOssStatInfo.hh -+++ b/src/XrdOss/XrdOssStatInfo.hh -@@ -35,6 +35,13 @@ class XrdOucEnv; - class XrdSysLogger; - struct stat; - -+namespace XrdOssStatEvent -+{ -+static const int FileAdded = 1; //!< Path has been added -+static const int PendAdded = 2; //!< Path has been added in pending mode -+static const int FileRemoved = 0; //!< Path has been removed -+} -+ - //------------------------------------------------------------------------------ - //! This file defines the alternate stat() function that can be used as a - //! replacement for the normal system stat() call that is used to determine the -@@ -60,13 +67,6 @@ struct stat; - //! @return Failure: a -1 with errno set to the correct err number value. - //------------------------------------------------------------------------------ - --typedef int (*XrdOssStatInfo_t) (const char *path, struct stat *buff, -- int opts, XrdOucEnv *envP); -- --typedef int (*XrdOssStatInfo2_t)(const char *path, struct stat *buff, -- int opts, XrdOucEnv *envP, -- const char *lfn); -- - //------------------------------------------------------------------------------ - //! Set file information. - //! -@@ -78,18 +78,22 @@ typedef int (*XrdOssStatInfo2_t)(const char *path, struct stat *buff, - //! @param path -> the file path whose whose stat information changed. - //! @param buff -> Nil; this indicates that stat information is being set. - //! @param opts One of the following options: --namespace XrdOssStatEvent --{ --static const int FileAdded = 1; //!< Path has been added --static const int PendAdded = 2; //!< Path has been added in pending mode --static const int FileRemoved = 0; //!< Path has been removed --} -+//! XrdOssStatEvent::FileAdded, -+//! XrdOssStatEvent::PendAdded, -+//! XrdOssStatEvent::FileRemoved. - //! @param envP -> Nil - //! @param lfn -> the logical file name whose stat information changed. - //! - //! @return The return value should be zero but is not currently inspected. - //------------------------------------------------------------------------------ - -+typedef int (*XrdOssStatInfo_t) (const char *path, struct stat *buff, -+ int opts, XrdOucEnv *envP); -+ -+typedef int (*XrdOssStatInfo2_t)(const char *path, struct stat *buff, -+ int opts, XrdOucEnv *envP, -+ const char *lfn); -+ - /******************************************************************************/ - /* X r d O s s S t a t I n f o I n s t a n t i a t o r */ - /******************************************************************************/ -@@ -123,11 +127,12 @@ static const int FileRemoved = 0; //!< Path has been removed - //! The function creator must be declared as an extern "C" function in the - //! plug-in shared library as follows: - //------------------------------------------------------------------------------ --/*! -- extern "C" XrdOssStatInfo_t XrdOssStatInfoInit(XrdOss *native_oss, -- XrdSysLogger *Logger, -- const char *config_fn, -- const char *parms); -+/*! @code {.cpp} -+ extern "C" XrdOssStatInfo_t XrdOssStatInfoInit(XrdOss *native_oss, -+ XrdSysLogger *Logger, -+ const char *config_fn, -+ const char *parms); -+ @endcode - - An alternate entry point may be defined in lieu of the previous entry point. - This normally identified by a version option in the configuration file (e.g. -@@ -137,11 +142,13 @@ static const int FileRemoved = 0; //!< Path has been removed - @param envP - Pointer to the environment containing implementation - specific information. - -- extern "C" XrdOssStatInfo2_t XrdOssStatInfoInit2(XrdOss *native_oss, -- XrdSysLogger *Logger, -- const char *config_fn, -- const char *parms, -- XrdOucEnv *envP); -+ @code {.cpp} -+ extern "C" XrdOssStatInfo2_t XrdOssStatInfoInit2(XrdOss *native_oss, -+ XrdSysLogger *Logger, -+ const char *config_fn, -+ const char *parms, -+ XrdOucEnv *envP); -+ @endcode - */ - - //------------------------------------------------------------------------------ -@@ -151,7 +158,8 @@ static const int FileRemoved = 0; //!< Path has been removed - //! your plug-in. Include the code shown below at file level in your source. - //------------------------------------------------------------------------------ - --/*! #include "XrdVersion.hh" -+/*! -+ #include "XrdVersion.hh" - XrdVERSIONINFO(XrdOssStatInfoInit,); - - where \ is a 1- to 15-character unquoted name identifying your plugin. -diff --git a/src/XrdOss/XrdOssWrapper.hh b/src/XrdOss/XrdOssWrapper.hh -index df82fc607..4df3d7923 100644 ---- a/src/XrdOss/XrdOssWrapper.hh -+++ b/src/XrdOss/XrdOssWrapper.hh -@@ -87,7 +87,7 @@ virtual int Readdir(char *buff, int blen) - //! Set the stat() buffer where stat information is to be placed corresponding - //! to the directory entry returned by Readdir(). - //! --//! @param buff - Pointer to stat structure to be used. -+//! @param Stat - Pointer to stat structure to be used. - //! - //! @return 0 upon success or -ENOTSUP if not supported. - //! -@@ -151,8 +151,8 @@ virtual int Fsync(XrdSfsAio *aiop) {return wrapDF.Fsync(aiop);} - //! @return 0 upon success or -errno or -osserr (see XrdOssError.hh). - //----------------------------------------------------------------------------- - --virtual int Ftruncate(unsigned long long offs) -- {return wrapDF.Ftruncate(offs);} -+virtual int Ftruncate(unsigned long long flen) -+ {return wrapDF.Ftruncate(flen);} - - //----------------------------------------------------------------------------- - //! Return the memory mapped characteristics of the file. -@@ -609,7 +609,7 @@ virtual int Reloc(const char *tident, const char *path, - //! Remove a directory. - //! - //! @param path - Pointer to the path of the directory to be removed. --//! @param opts - The processing options: -+//! @param Opts - The processing options: - //! XRDOSS_Online - only remove online copy - //! XRDOSS_isPFN - path is already translated. - //! @param envP - Pointer to environmental information. -@@ -672,9 +672,6 @@ virtual int Stats(char *buff, int blen) - //! @param buff - Pointer to the buffer to hold the information. - //! @param blen - Length of the buffer. This is updated with the actual - //! number of bytes placed in the buffer as in snprintf(). --//! @param opts - Options: --//! XRDEXP_STAGE - info for stageable space wanted. --//! XRDEXP_NOTRW - info for Read/Only space wanted. - //! @param envP - Pointer to environmental information. - //! - //! @return " " -@@ -692,16 +689,14 @@ virtual int StatFS(const char *path, char *buff, int &blen, - //----------------------------------------------------------------------------- - //! Return filesystem physical space information associated with a space name. - //! -+//! @param env - Ref to environmental information. If the environment -+//! has the key oss.cgroup defined, the associated value is -+//! used as the space name and the path is ignored. - //! @param path - Path in the name space in question. The space name - //! associated with gthe path is used unless overridden. - //! @param buff - Pointer to the buffer to hold the information. - //! @param blen - Length of the buffer. This is updated with the actual - //! number of bytes placed in the buffer as in snprintf(). --//! @param opts - Options (see StatFS()) apply only when there are no --//! spaces defined. --//! @param envP - Ref to environmental information. If the environment --//! has the key oss.cgroup defined, the associated value is --//! used as the space name and the path is ignored. - //! - //! @return "oss.cgroup=&oss.space=&oss.free= - //! &oss.maxf=&oss.used= -@@ -807,7 +802,7 @@ virtual int Truncate(const char *path, unsigned long long fsize, - //! Remove a file. - //! - //! @param path - Pointer to the path of the file to be removed. --//! @param opts - Options: -+//! @param Opts - Options: - //! XRDOSS_isMIG - this is a migratable path. - //! XRDOSS_isPFN - do not apply name2name to path. - //! XRDOSS_Online - remove only the online copy. -diff --git a/src/XrdOuc/XrdOucBackTrace.hh b/src/XrdOuc/XrdOucBackTrace.hh -index 5a00c619a..bde7d439c 100644 ---- a/src/XrdOuc/XrdOucBackTrace.hh -+++ b/src/XrdOuc/XrdOucBackTrace.hh -@@ -106,7 +106,7 @@ static void DoBT(const char *head=0, void *thisP=0, void *objP=0, - //! login mkdir mv open ping prepare protocol putfile query read - //! readv rm rmdir set stat statx sync truncate verifyw write - //! --//! @param reqs The kXR_ response code name(s). If the pointer is nil, the -+//! @param rsps The kXR_ response code name(s). If the pointer is nil, the - //! back trace filter is set using envar XRDBT_RSPFILTER as the - //! argument. If both are nil, no filter is established. - //! Specify, one or more names, each separated by a space. -diff --git a/src/XrdOuc/XrdOucBuffer.hh b/src/XrdOuc/XrdOucBuffer.hh -index aef1abc64..ace08ab1d 100644 ---- a/src/XrdOuc/XrdOucBuffer.hh -+++ b/src/XrdOuc/XrdOucBuffer.hh -@@ -201,7 +201,7 @@ inline int DataLen() {return dlen;} - //----------------------------------------------------------------------------- - //! Highjack the buffer contents and reinitialize the original buffer. - //! --//! @param xsz - the desired size to be given to the highjacked buffer. If -+//! @param bPsz - the desired size to be given to the highjacked buffer. If - //! zero, the current size is used. Same size resictions apply - //! as for buffer pool Alloc(), above. - //! -diff --git a/src/XrdOuc/XrdOucCRC.hh b/src/XrdOuc/XrdOucCRC.hh -index b8a8139cb..a59651d8f 100644 ---- a/src/XrdOuc/XrdOucCRC.hh -+++ b/src/XrdOuc/XrdOucCRC.hh -@@ -74,8 +74,8 @@ static uint32_t Calc32C(const void* data, size_t count, uint32_t prevcs=0); - //! @param csval Pointer to a vector to hold individual page checksums. The - //! vector must be sized: - //! (count/XrdSys::PageSize + (count%XrdSys::PageSize != 0)). --//! --//! @return Each element of csval holds the checksum for the associated page. -+//! On return, each element of csval holds the checksum for -+//! the associated page. - //------------------------------------------------------------------------------ - - static void Calc32C(const void* data, size_t count, uint32_t* csval); -diff --git a/src/XrdOuc/XrdOucCache.hh b/src/XrdOuc/XrdOucCache.hh -index c99508f35..4b1222c1c 100644 ---- a/src/XrdOuc/XrdOucCache.hh -+++ b/src/XrdOuc/XrdOucCache.hh -@@ -398,9 +398,6 @@ virtual int Trunc(long long offs) = 0; - //! caller holds any locks they must be recursive locks as the - //! callback may occur on the calling thread. - //! @param offs the size the file is have. --//! --//! @return <0 - Trunc failed, value is -errno. --//! =0 - Trunc succeeded. - //------------------------------------------------------------------------------ - - virtual void Trunc(XrdOucCacheIOCB &iocb, long long offs) -@@ -720,7 +717,7 @@ virtual ~XrdOucCache() {} - - //------------------------------------------------------------------------------ - //! Your cache plug-in must exist in a shared library and have the following --//! extern C function defined whos parameters are: -+//! extern C function defined whose parameters are: - //! - //! @param Logger Pointer to the logger object that should be used with an - //! instance of XrdSysError to direct messages to a log file. -@@ -732,22 +729,24 @@ virtual ~XrdOucCache() {} - //! path. If Parms is null, there are no parameters. - //! @param envP Pointer to environmental information. The most relevant - //! is whether or not gStream monitoring is enabled. -+//! @code {.cpp} - //! XrdXrootdGStream *gStream = (XrddXrootdGStream *) - //! envP->GetPtr("pfc.gStream*"); -+//! @endcode - //! @return A usable, fully configured, instance of an XrdOucCache - //! object upon success and a null pointer otherwise. This - //! instance is used for all operations defined by methods in - //! XrdOucCache base class. - //! -+//! @code {.cpp} - //! extern "C" - //! { - //! XrdOucCache *XrdOucGetCache(XrdSysLogger *Logger, // Where messages go - //! const char *Config, // Config file used - //! const char *Parms, // Optional parm string --//! } XrdOucEnv *envP); // Optional environment -- --typedef XrdOucCache *(*XrdOucCache_t)(XrdSysLogger *, const char *, -- const char *, XrdOucEnv *); -+//! XrdOucEnv *envP); // Optional environment -+//! } -+//! @endcode - - //------------------------------------------------------------------------------ - //! Declare compilation version. -@@ -756,9 +755,14 @@ typedef XrdOucCache *(*XrdOucCache_t)(XrdSysLogger *, const char *, - //! your plug-in. Declare it as shown below. - //------------------------------------------------------------------------------ - --/*! #include "XrdVersion.hh" -- XrdVERSIONINFO(XrdOucGetCache,); -+/*! -+ #include "XrdVersion.hh" -+ XrdVERSIONINFO(XrdOucGetCache,); - - where is a 1- to 15-character unquoted name identifying your plugin. - */ -+ -+typedef XrdOucCache *(*XrdOucCache_t)(XrdSysLogger *Logger, const char *Config, -+ const char *Parms, XrdOucEnv *envP); -+ - #endif -diff --git a/src/XrdOuc/XrdOucERoute.hh b/src/XrdOuc/XrdOucERoute.hh -index e9659cb28..5aeeec95b 100644 ---- a/src/XrdOuc/XrdOucERoute.hh -+++ b/src/XrdOuc/XrdOucERoute.hh -@@ -61,7 +61,7 @@ static int Format(char *buff, int blen, int ecode, const char *etxt1, - //! @param estrm pointer to the XrdOucStrean object which is to receive the - //! error message text or null if none exists. - //! @param esfx The suffix identifier to use when routing to the log. --//! @param enum the error number associated iwth the error. -+//! @param ecode the error number associated iwth the error. - //! @param etxt1 associated text token #1. - //! @param etxt2 associated text token #2 (optional). - //! -diff --git a/src/XrdOuc/XrdOucErrInfo.hh b/src/XrdOuc/XrdOucErrInfo.hh -index e2f40a0a0..491ba9a11 100644 ---- a/src/XrdOuc/XrdOucErrInfo.hh -+++ b/src/XrdOuc/XrdOucErrInfo.hh -@@ -357,8 +357,6 @@ inline int getErrMid() {return mID;} - - //----------------------------------------------------------------------------- - //! Set the monitoring identifier. --//! --//! @return The monitoring identifier. - //----------------------------------------------------------------------------- - - inline void setErrMid(int mid) {mID = mid;} -diff --git a/src/XrdOuc/XrdOucFileInfo.hh b/src/XrdOuc/XrdOucFileInfo.hh -index 9710a5693..5897c3be4 100644 ---- a/src/XrdOuc/XrdOucFileInfo.hh -+++ b/src/XrdOuc/XrdOucFileInfo.hh -@@ -97,7 +97,7 @@ void AddProtocol(const char * protname); - //----------------------------------------------------------------------------- - //! Obtain the next digest that can be used to validate the file. - //! --//! @param hVal Place to put the pointer to the hash value in ASCII -+//! @param hval Place to put the pointer to the hash value in ASCII - //! encoded hex, - //! @param xrdname When true the corresponding name expected by XRootD is - //! returned -diff --git a/src/XrdOuc/XrdOucGMap.hh b/src/XrdOuc/XrdOucGMap.hh -index 0f93c867d..a3532f32c 100644 ---- a/src/XrdOuc/XrdOucGMap.hh -+++ b/src/XrdOuc/XrdOucGMap.hh -@@ -155,8 +155,6 @@ int load(const char *mf, bool force = 0); - //! otherwise system performance will be severely degraded. - //------------------------------------------------------------------------------ - --extern "C" XrdOucGMap *XrdOucgetGMap(XrdOucGMapArgs); -- - //------------------------------------------------------------------------------ - //! Declare compilation version. - //! -@@ -165,9 +163,13 @@ extern "C" XrdOucGMap *XrdOucgetGMap(XrdOucGMapArgs); - //! avoid execution issues should the class definition change. Declare it as: - //------------------------------------------------------------------------------ - --/*! #include "XrdVersion.hh" -- XrdVERSIONINFO(XrdOucgetGMap,); -+/*! -+ #include "XrdVersion.hh" -+ XrdVERSIONINFO(XrdOucgetGMap,); - - where is a 1- to 15-character unquoted name identifying your plugin. - */ -+ -+extern "C" XrdOucGMap *XrdOucgetGMap(XrdOucGMapArgs); -+ - #endif -diff --git a/src/XrdOuc/XrdOucGatherConf.hh b/src/XrdOuc/XrdOucGatherConf.hh -index 9302115f6..ce5d6ecd1 100644 ---- a/src/XrdOuc/XrdOucGatherConf.hh -+++ b/src/XrdOuc/XrdOucGatherConf.hh -@@ -83,7 +83,7 @@ bool hasData(); - //------------------------------------------------------------------------------ - //! Attempt to use pre-existing data. - //! --//! @param Pointer to null terminated pre-existing data. -+//! @param data Pointer to null terminated pre-existing data. - //! - //! @return False if the pointer is nil or points to a null string; true o/w. - //------------------------------------------------------------------------------ -diff --git a/src/XrdOuc/XrdOucPgrwUtils.hh b/src/XrdOuc/XrdOucPgrwUtils.hh -index c71ab9fff..96c6937b6 100644 ---- a/src/XrdOuc/XrdOucPgrwUtils.hh -+++ b/src/XrdOuc/XrdOucPgrwUtils.hh -@@ -47,8 +47,8 @@ public: - //! @param csval Pointer to a vector to hold individual page checksums. The - //! raw vector must be sized as computed by csNum(). When - //! passed an std::vector, it is done automatically. --//! --//! @return Each element of csval holds the checksum for the associated page. -+//! On return, each element of csval holds the checksum for -+//! the associated page. - //------------------------------------------------------------------------------ - - static void csCalc(const char* data, off_t offs, size_t count, -diff --git a/src/XrdOuc/XrdOucPinKing.hh b/src/XrdOuc/XrdOucPinKing.hh -index 55abaaaf9..f96a5fd47 100644 ---- a/src/XrdOuc/XrdOucPinKing.hh -+++ b/src/XrdOuc/XrdOucPinKing.hh -@@ -54,7 +54,7 @@ public: - //! Add an Pin object to the load list. - //! - //! @param path Pointer to the pin's path. --//! @param parm Pointer to the pin's parameters. -+//! @param parms Pointer to the pin's parameters. - //! @param push When true pushes the pin onto the load stack. Otherwise, - //! replaces or defines the base plugin. - //------------------------------------------------------------------------------ -@@ -82,9 +82,9 @@ T *Load(const char *Symbol); - //! @param drctv Ref to the directive that initiated the load. The text is - //! used in error messages to relate the directive to the error. - //! E.g. "sec.entlib" -> "Unable to load sec.entlib plugin...." --//! @param envP Ref to environment. --//! @param errP Ref to the message routing object. --//! @param vInfo Pointer to the version information of the caller. If the -+//! @param envR Ref to environment. -+//! @param errR Ref to the message routing object. -+//! @param vinfo Pointer to the version information of the caller. If the - //! pointer is nil, no version checking occurs. - //------------------------------------------------------------------------------ - -diff --git a/src/XrdOuc/XrdOucVerName.hh b/src/XrdOuc/XrdOucVerName.hh -index a160f9359..ba9e64fdb 100644 ---- a/src/XrdOuc/XrdOucVerName.hh -+++ b/src/XrdOuc/XrdOucVerName.hh -@@ -43,7 +43,7 @@ public: - //! Test if plugin path contains a version number. - //! - //! @param piPath Pointer to the original path to the plug-in. --//! @param piNoVm != 0: If piPath has a version, an strdup'd path without a -+//! @param piNoVN != 0: If piPath has a version, an strdup'd path without a - //! version is returned. Otherwise, nil is returned. - //! == 0: Does not return an alternate path. - //! -diff --git a/src/XrdPosix/XrdPosixCache.hh b/src/XrdPosix/XrdPosixCache.hh -index 38b968940..45efdf4d1 100644 ---- a/src/XrdPosix/XrdPosixCache.hh -+++ b/src/XrdPosix/XrdPosixCache.hh -@@ -77,8 +77,8 @@ int Rmdir(const char* path); - //----------------------------------------------------------------------------- - //! Rename a file or directory in the cache. - //! --//! @param oldpath -> filepath of existing directory or file. --//! @param newpath -> filepath the directory or file is to have. -+//! @param oldPath -> filepath of existing directory or file. -+//! @param newPath -> filepath the directory or file is to have. - //! - //! @return 0 This method is currently not supported. - //----------------------------------------------------------------------------- -@@ -101,7 +101,7 @@ int Stat(const char *path, struct stat &sbuff); - //----------------------------------------------------------------------------- - //! Rename a file or directory in the cache. - //! --//! @param Stat Reference to the statistics object to be filled in. -+//! @param Stats Reference to the statistics object to be filled in. - //----------------------------------------------------------------------------- - - void Statistics(XrdOucCacheStats &Stats); -diff --git a/src/XrdPosix/XrdPosixXrootd.hh b/src/XrdPosix/XrdPosixXrootd.hh -index 836dd1352..2902af519 100644 ---- a/src/XrdPosix/XrdPosixXrootd.hh -+++ b/src/XrdPosix/XrdPosixXrootd.hh -@@ -322,9 +322,6 @@ static int Unlink(const char *path); - //! @param n the number of elements in the readV vector. - //! - //! @param cbp pointer to the callback object for async execution. --//! --//! @return Upon success returns the total number of bytes read. Otherwise, -1 --//! is returned and errno is appropriately set. - //----------------------------------------------------------------------------- - - static void VRead(int fildes, const XrdOucIOVec *readV, int n, -diff --git a/src/XrdPss/XrdPss.hh b/src/XrdPss/XrdPss.hh -index fe5bc3ca0..e864a0983 100644 ---- a/src/XrdPss/XrdPss.hh -+++ b/src/XrdPss/XrdPss.hh -@@ -90,7 +90,7 @@ ssize_t pgRead (void* buffer, off_t offset, size_t rdlen, - int pgRead (XrdSfsAio* aioparm, uint64_t opts); - ssize_t pgWrite(void* buffer, off_t offset, size_t wrlen, - uint32_t* csvec, uint64_t opts); --int pgWrite(XrdSfsAio* aoiparm, uint64_t opts); -+int pgWrite(XrdSfsAio* aioparm, uint64_t opts); - ssize_t Read( off_t, size_t); - ssize_t Read( void *, off_t, size_t); - int Read(XrdSfsAio *aiop); -diff --git a/src/XrdRmc/XrdRmc.hh b/src/XrdRmc/XrdRmc.hh -index 02c538a28..bbf7b8d2d 100644 ---- a/src/XrdRmc/XrdRmc.hh -+++ b/src/XrdRmc/XrdRmc.hh -@@ -38,53 +38,55 @@ - cache. There can be many such instances. Each instance is associated with - one or more XrdOucCacheIO objects (see the XrdOucCache::Attach() method). - -- Notes: 1. The minimum PageSize is 4096 (4k) and must be a power of 2. -- The maximum PageSize is 16MB. -- 2. The size of the cache is forced to be a multiple PageSize and -- have a minimum size of PageSize * 256. -- 3. The minimum external read size is equal to PageSize. -- 4. Currently, only write-through caches are supported. -- 5. The Max2Cache value avoids placing data in the cache when a read -- exceeds the specified value. The minimum allowed is PageSize, which -- is also the default. -- 6. Structured file optimization allows pages whose bytes have been -- fully referenced to be discarded; effectively increasing the cache. -- 7. A structured cache treats all files as structured. By default, the -- cache treats files as unstructured. You can over-ride the settings -- on an individual file basis when the file's I/O object is attached -- by passing the XrdOucCache::optFIS option, if needed. -- 8. Write-in caches are only supported for files attached with the -- XrdOucCache::optWIN setting. Otherwise, updates are handled -- with write-through operations. -- 9. A cache object may be deleted. However, the deletion is delayed -- until all CacheIO objects attached to the cache are detached. -- 10. The default maximum attached files is set to 8192 when isServer -- has been specified. Otherwise, it is set at 256. -- 11. When canPreRead is specified, the cache asynchronously handles -- preread requests (see XrdOucCacheIO::Preread()) using 9 threads -- when isServer is in effect. Otherwise, 3 threads are used. -- 12. The max queue depth for prereads is 8. When the max is exceeded -- the oldest preread is discarded to make room for the newest one. -- 13. If you specify the canPreRead option when creating the cache you -- can also enable automatic prereads if the algorithm is workable. -- Otherwise, you will need to implement your own algorithm and -- issue prereads manually using the XrdOucCacheIO::Preread() method. -- 14. The automatic preread algorithm is (see aprParms): -- a) A preread operation occurs when all of the following conditions -- are satisfied: -- o The cache CanPreRead option is in effect. -- o The read length < 'miniRead' -- ||(read length < 'maxiRead' && Offset == next maxi offset) -- b) The preread page count is set to be readlen/pagesize and the -- preread occurs at the page after read_offset+readlen. The page -- is adjusted, as follows: -- o If the count is < minPages, it is set to minPages. -- o The count must be > 0 at this point. -- c) Normally, pre-read pages participate in the LRU scheme. However, -- if the preread was triggered using 'maxiRead' then the pages are -- marked for single use only. This means that the moment data is -- delivered from the page, the page is recycled. -- 15. Invalid options silently force the use of the default. -+ Notes: -+ -+ 1. The minimum PageSize is 4096 (4k) and must be a power of 2. -+ The maximum PageSize is 16MB. -+ 2. The size of the cache is forced to be a multiple PageSize and -+ have a minimum size of PageSize * 256. -+ 3. The minimum external read size is equal to PageSize. -+ 4. Currently, only write-through caches are supported. -+ 5. The Max2Cache value avoids placing data in the cache when a read -+ exceeds the specified value. The minimum allowed is PageSize, which -+ is also the default. -+ 6. Structured file optimization allows pages whose bytes have been -+ fully referenced to be discarded; effectively increasing the cache. -+ 7. A structured cache treats all files as structured. By default, the -+ cache treats files as unstructured. You can over-ride the settings -+ on an individual file basis when the file's I/O object is attached -+ by passing the XrdOucCache::optFIS option, if needed. -+ 8. Write-in caches are only supported for files attached with the -+ XrdOucCache::optWIN setting. Otherwise, updates are handled -+ with write-through operations. -+ 9. A cache object may be deleted. However, the deletion is delayed -+ until all CacheIO objects attached to the cache are detached. -+ 10. The default maximum attached files is set to 8192 when isServer -+ has been specified. Otherwise, it is set at 256. -+ 11. When canPreRead is specified, the cache asynchronously handles -+ preread requests (see XrdOucCacheIO::Preread()) using 9 threads -+ when isServer is in effect. Otherwise, 3 threads are used. -+ 12. The max queue depth for prereads is 8. When the max is exceeded -+ the oldest preread is discarded to make room for the newest one. -+ 13. If you specify the canPreRead option when creating the cache you -+ can also enable automatic prereads if the algorithm is workable. -+ Otherwise, you will need to implement your own algorithm and -+ issue prereads manually using the XrdOucCacheIO::Preread() method. -+ 14. The automatic preread algorithm is (see aprParms): -+ 1. A preread operation occurs when all of the following conditions -+ are satisfied: -+ - The cache CanPreRead option is in effect. -+ - The read length < 'miniRead' -+ || (read length < 'maxiRead' && Offset == next maxi offset) -+ 2. The preread page count is set to be readlen/pagesize and the -+ preread occurs at the page after read_offset+readlen. The page -+ is adjusted, as follows: -+ - If the count is < minPages, it is set to minPages. -+ - The count must be > 0 at this point. -+ 3. Normally, pre-read pages participate in the LRU scheme. However, -+ if the preread was triggered using 'maxiRead' then the pages are -+ marked for single use only. This means that the moment data is -+ delivered from the page, the page is recycled. -+ 15. Invalid options silently force the use of the default. - */ - - class XrdRmc -@@ -136,8 +138,8 @@ Debug = 0x0003; //!< Produce some debug messages (levels 0, 1, 2, or 3) - //----------------------------------------------------------------------------- - //! Create an instance of a memory cache. - //! --//! @param Reference to mandatory cache parameters. --//! @param Optional pointer to default automatic preread parameters. -+//! @param Params Reference to mandatory cache parameters. -+//! @param aprP Optional pointer to default automatic preread parameters. - //! - //! @return Success: a pointer to a new instance of the cache. - //! Failure: a null pointer is returned and errno set to the reason. -diff --git a/src/XrdSec/XrdSecInterface.hh b/src/XrdSec/XrdSecInterface.hh -index 53fe8fe83..ea4ec12b5 100644 ---- a/src/XrdSec/XrdSecInterface.hh -+++ b/src/XrdSec/XrdSecInterface.hh -@@ -376,9 +376,11 @@ virtual ~XrdSecProtocol() {} - //! return true (the default is to return false). - //------------------------------------------------------------------------------ - --/*! extern "C" char *XrdSecProtocol

Init (const char who, -+/*! @code {.cpp} -+ extern "C" char *XrdSecProtocol

Init (const char who, - const char *parms, - XrdOucErrInfo *einfo) {. . . .} -+ @endcode - */ - - //------------------------------------------------------------------------------ -@@ -386,7 +388,7 @@ virtual ~XrdSecProtocol() {} - //! - //! @param who contains 'c' when called on the client side and 's' when - //! called on the server side. --//! @param host The client's host name or the IP address as text. An IP -+//! @param hostname The client's host name or the IP address as text. An IP - //! may be supplied if the host address is not resolvable. Use - //! endPoint to get the hostname only if it's actually needed. - //! @param endPoint the XrdNetAddrInfo object describing the end-point. When -@@ -478,10 +480,10 @@ virtual ~XrdSecProtocol() {} - //! Typedef to simplify the encoding of methods returning XrdSecProtocol. - //------------------------------------------------------------------------------ - --typedef XrdSecProtocol *(*XrdSecGetProt_t)(const char *, -- XrdNetAddrInfo &, -- XrdSecParameters &, -- XrdOucErrInfo *); -+typedef XrdSecProtocol *(*XrdSecGetProt_t)(const char *hostname, -+ XrdNetAddrInfo &endPoint, -+ XrdSecParameters §oken, -+ XrdOucErrInfo *einfo); - - /*! Example: - -diff --git a/src/XrdSec/XrdSecProtect.hh b/src/XrdSec/XrdSecProtect.hh -index d42541dd8..e18e76e80 100644 ---- a/src/XrdSec/XrdSecProtect.hh -+++ b/src/XrdSec/XrdSecProtect.hh -@@ -92,7 +92,7 @@ virtual void Delete() {delete this;} - //! using free() when it is no longer needed. - //! @param thereq Reference to the client request header/body that needs to - //! be secured. The request must be in network byte order. --//! @aparam thedata The request data whose length resides in theReq.dlen. If -+//! @param thedata The request data whose length resides in theReq.dlen. If - //! thedata is nil but thereq.dlen is not zero then the request - //! data must follow the request header in the thereq buffer. - //! -@@ -114,7 +114,7 @@ virtual int Secure(SecurityRequest *&newreq, - //! All but the request code must be in network byte order. - //! @param thereq Reference to the client request header/body that needs to - //! be verified. The request must be in network byte order. --//! @aparam thedata The request data whose length resides in theReq.dlen. -+//! @param thedata The request data whose length resides in theReq.dlen. - //! - //! @return Upon success zero is returned. Otherwise a pointer to a null - //! delimited string describing the problem is returned. -diff --git a/src/XrdSecsss/XrdSecsssID.hh b/src/XrdSecsss/XrdSecsssID.hh -index 627532435..51c2ffac8 100644 ---- a/src/XrdSecsss/XrdSecsssID.hh -+++ b/src/XrdSecsss/XrdSecsssID.hh -@@ -99,7 +99,7 @@ enum authType - //! @param lgnid - Pointer to the login ID. - //! @param Ident - Pointer to the entity object to be registstered. If the - //! pointer is NIL, then the mapping is deleted. --//! @param doRep - When true, any existing mapping is replaced. -+//! @param doReplace - When true, any existing mapping is replaced. - //! @param defer - When true, the entity object is recorded but serialization - //! is deferred until the object is needed. The entity object - //! must remain valid until the mapping is deleted. The entity -@@ -125,7 +125,7 @@ private: - //! @param dP - Reference to a pointer where the serialized ID is returned. - //! The caller is responsible for freeing the storage. - //! @param myIP - Pointer to IP address of client. --//! @param opts - Options to pass to the XrdSecsssEnt data extractor. -+//! @param dataOpts - Options to pass to the XrdSecsssEnt data extractor. - //! See XrdSecsssEnt::rr_Data for details. - //! - //! @return The length of the structure pointed to by dP; zero if not found. -@@ -136,7 +136,7 @@ int Find(const char *lid, char *&dP, const char *myIP, int dataOpts=0); - //----------------------------------------------------------------------------- - //! Get initial parameters for sss ID mapping. - //! --//! @param atype - The authentication type used by this object. -+//! @param aType - The authentication type used by this object. - //! @param idP - Reference to a pointer where the default ID is returned. - //! - //! @return A pointer to this object if it was instantiated, otherwise nil. -diff --git a/src/XrdSfs/XrdSfsGPFile.hh b/src/XrdSfs/XrdSfsGPFile.hh -index 302270463..6241d21a4 100644 ---- a/src/XrdSfs/XrdSfsGPFile.hh -+++ b/src/XrdSfs/XrdSfsGPFile.hh -@@ -72,8 +72,8 @@ void *rsvd3; //!< Reserved field - //! @param emsg - An optional message further explaining the reason for the - //! failure (highly recommended). - //! --//! @return No value is returned but this object is deleted and no references --//! to the object should exist after return is made. -+//! No value is returned but this object is deleted and no references -+//! to the object should exist after return is made. - //----------------------------------------------------------------------------- - - virtual void Finished(int rc, const char *emsg=0) = 0; -diff --git a/src/XrdSfs/XrdSfsInterface.hh b/src/XrdSfs/XrdSfsInterface.hh -index b0da000a3..31340182b 100644 ---- a/src/XrdSfs/XrdSfsInterface.hh -+++ b/src/XrdSfs/XrdSfsInterface.hh -@@ -375,23 +375,23 @@ public: - //----------------------------------------------------------------------------- - //! Open a file. - //! --//! @param path - Pointer to the path of the file to be opened. --//! @param oMode - Flags indicating how the open is to be handled. --//! SFS_O_CREAT create the file --//! SFS_O_MKPTH Make directory path if missing --//! SFS_O_NOWAIT do not impose operational delays --//! SFS_O_NOTPC do not allow TPC operation --//! SFS_O_POSC persist only on successful close --//! SFS_O_RAWIO allow client-side decompression --//! SFS_O_RDONLY open read/only --//! SFS_O_RDWR open read/write --//! SFS_O_REPLICA Open for replication --//! SFS_O_RESET Reset any cached information --//! SFS_O_TRUNC truncate existing file to zero length --//! SFS_O_WRONLY open write/only --//! @param cMode - The file's mode if it will be created. --//! @param client - Client's identify (see common description). --//! @param opaque - path's CGI information (see common description). -+//! @param fileName - Pointer to the path of the file to be opened. -+//! @param openMode - Flags indicating how the open is to be handled. -+//! SFS_O_CREAT create the file -+//! SFS_O_MKPTH Make directory path if missing -+//! SFS_O_NOWAIT do not impose operational delays -+//! SFS_O_NOTPC do not allow TPC operation -+//! SFS_O_POSC persist only on successful close -+//! SFS_O_RAWIO allow client-side decompression -+//! SFS_O_RDONLY open read/only -+//! SFS_O_RDWR open read/write -+//! SFS_O_REPLICA Open for replication -+//! SFS_O_RESET Reset any cached information -+//! SFS_O_TRUNC truncate existing file to zero length -+//! SFS_O_WRONLY open write/only -+//! @param createMode - The file's mode if it will be created. -+//! @param client - Client's identify (see common description). -+//! @param opaque - path's CGI information (see common description). - //! - //! @return One of SFS_OK, SFS_ERROR, SFS_REDIRECT, SFS_STALL, or SFS_STARTED - //----------------------------------------------------------------------------- -@@ -497,8 +497,8 @@ virtual const char *FName() = 0; - //----------------------------------------------------------------------------- - //! Get file's memory mapping if one exists (memory mapped files only). - //! --//! @param addr - Place where the starting memory address is returned. --//! @param size - Place where the file's size is returned. -+//! @param Addr - Place where the starting memory address is returned. -+//! @param Size - Place where the file's size is returned. - //! - //! @return SFS_OK when the file is memory mapped or any other code otherwise. - //----------------------------------------------------------------------------- -@@ -636,7 +636,7 @@ virtual int read(XrdSfsAio *aioparm) = 0; - //! implementation is supplied but should be replaced to increase performance. - //! - //! @param readV pointer to the array of read requests. --//! @param rdvcnt the number of elements in readV. -+//! @param rdvCnt the number of elements in readV. - //! - //! @return >=0 The numbe of bytes placed into the buffer. - //! @return SFS_ERROR File could not be read, error holds the reason. -@@ -693,7 +693,7 @@ virtual int write(XrdSfsAio *aioparm) = 0; - //! supplied but should be replaced to increase performance. - //! - //! @param writeV pointer to the array of write requests. --//! @param wdvcnt the number of elements in writeV. -+//! @param wdvCnt the number of elements in writeV. - //! - //! @return >=0 The total number of bytes written to the file. - //! @return SFS_ERROR File could not be written, error holds the reason. -@@ -755,7 +755,7 @@ virtual int getCXinfo(char cxtype[4], int &cxrsz) = 0; - //----------------------------------------------------------------------------- - //! Enable exchange buffer I/O for write calls. - //! --//! @param - Pointer to the XrdSfsXio object to be used for buffer exchanges. -+//! @param xioP - Pointer to the XrdSfsXio object to be used for buffer exchanges. - //----------------------------------------------------------------------------- - - virtual void setXio(XrdSfsXio *xioP) { (void)xioP; } -@@ -1226,7 +1226,7 @@ virtual int rename(const char *oPath, - //----------------------------------------------------------------------------- - //! Return state information on a file or directory. - //! --//! @param path - Pointer to the path in question. -+//! @param Name - Pointer to the path in question. - //! @param buf - Pointer to the structure where info it to be returned. - //! @param eInfo - The object where error info is to be returned. - //! @param client - Client's identify (see common description). -@@ -1303,7 +1303,7 @@ uint64_t FeatureSet; //!< Adjust features at initialization - @param nativeFS - the filesystem that would have been used. You may return - this pointer if you wish. - @param Logger - The message logging object to be used for messages. -- @param configFN - pointer to the path of the configuration file. If nil -+ @param configFn - pointer to the path of the configuration file. If nil - there is no configuration file. - @param envP - Pointer to the environment containing implementation - specific information. -diff --git a/src/XrdSsi/XrdSsiLogger.hh b/src/XrdSsi/XrdSsiLogger.hh -index 282c774a7..930321161 100644 ---- a/src/XrdSsi/XrdSsiLogger.hh -+++ b/src/XrdSsi/XrdSsiLogger.hh -@@ -47,7 +47,7 @@ public: - //! @param pfx !0 -> the text to prefix the message; the message is formed as - //! pfx: txt1 [txt2] [txt3]\n - //! pfx =0 -> add message to the log without a time stamp or prefix. --//! @param msg the message to added to the log. -+//! @param txt1,txt2,txt3 the message to be added to the log. - //----------------------------------------------------------------------------- - - static void Msg(const char *pfx, const char *txt1, -@@ -86,7 +86,7 @@ static void Msgv(const char *pfx, const char *fmt, va_list aP); - //! - //! @param iovP pointer to an iovec that contains the message. - //! that a newline character is always appended to the message. --//! @param iobN the number of elements in the iovec. -+//! @param iovN the number of elements in the iovec. - //----------------------------------------------------------------------------- - - static void Msgv(struct iovec *iovP, int iovN); -diff --git a/src/XrdSsi/XrdSsiRequest.hh b/src/XrdSsi/XrdSsiRequest.hh -index feed3db4d..f2a406ce4 100644 ---- a/src/XrdSsi/XrdSsiRequest.hh -+++ b/src/XrdSsi/XrdSsiRequest.hh -@@ -192,7 +192,7 @@ virtual bool ProcessResponse(const XrdSsiErrInfo &eInfo, - //! @param buff Pointer to the buffer given to XrdSsiStream::SetBuff(). - //! @param blen The number of bytes in buff or an error indication if blen < 0. - //! @param last true This is the last stream segment, no more data remains. --//! @param false More data may remain in the stream. -+//! false More data may remain in the stream. - //----------------------------------------------------------------------------- - - virtual void ProcessResponseData(const XrdSsiErrInfo &eInfo, char *buff, -@@ -263,7 +263,7 @@ virtual void RelRequestBuffer() {} - //! to XrdSsiService::ProcessRequest(). Once the request is started, a request - //! handle is returned which can be passed to XrdSsiService::Attach(). - //! --//! @param detttl The detach time to live value. -+//! @param dttl The detach time to live value. - //----------------------------------------------------------------------------- - - inline void SetDetachTTL(uint32_t dttl) {detTTL = dttl;} -diff --git a/src/XrdSsi/XrdSsiResponder.hh b/src/XrdSsi/XrdSsiResponder.hh -index 7f446645c..90d8b58d7 100644 ---- a/src/XrdSsi/XrdSsiResponder.hh -+++ b/src/XrdSsi/XrdSsiResponder.hh -@@ -121,7 +121,7 @@ protected: - //! (e.g. data response buffer or a stream). This method is invoked when - //! XrdSsiRequest::Finished() is called by the client. - //! --//! @param rqstP reference to the object describing the request. -+//! @param rqstR reference to the object describing the request. - //! @param rInfo reference to the object describing the response. - //! @param cancel False -> the request/response interaction completed. - //! True -> the request/response interaction aborted because -diff --git a/src/XrdSsi/XrdSsiService.hh b/src/XrdSsi/XrdSsiService.hh -index 73fec2140..c1e35bc63 100644 ---- a/src/XrdSsi/XrdSsiService.hh -+++ b/src/XrdSsi/XrdSsiService.hh -@@ -149,10 +149,10 @@ virtual bool Prepare(XrdSsiErrInfo &eInfo, const XrdSsiResource &rDesc); - //! @param resRef Reference to the Resource object that describes the - //! resource that the request will be using. - //! --//! @return All results are returned via the request object callback methods. --//! For background queries, the XrdSsiRequest::ProcessResponse() is --//! called with a response type of isHandle when the request is handed --//! off to the endpoint for execution (see XrdSsiRequest::SetDetachTTL). -+//! All results are returned via the request object callback methods. -+//! For background queries, the XrdSsiRequest::ProcessResponse() is -+//! called with a response type of isHandle when the request is handed -+//! off to the endpoint for execution (see XrdSsiRequest::SetDetachTTL). - //----------------------------------------------------------------------------- - - virtual void ProcessRequest(XrdSsiRequest &reqRef, -diff --git a/src/XrdSsi/XrdSsiShMap.hh b/src/XrdSsi/XrdSsiShMap.hh -index b2b353775..f074c2203 100644 ---- a/src/XrdSsi/XrdSsiShMap.hh -+++ b/src/XrdSsi/XrdSsiShMap.hh -@@ -112,7 +112,7 @@ enum SyncOpt {SyncOff = 0, SyncOn, SyncAll, SyncNow, SyncQSz}; - //----------------------------------------------------------------------------- - //! Typedef for the optional hash computation function (see constructor) - //! --//! @param parms Pointer to the key whose hash is to be returned. If nil -+//! @param key Pointer to the key whose hash is to be returned. If nil - //! the function should return its 4-character name (e.g. - //! {int hash; memcpy(&hash, "c32 ", sizeof(int)); return hash;} - //! -@@ -157,6 +157,8 @@ bool Attach(const char *path, ShMap_Access access, int tmo=-1); - //! done, call Export() to make the new map visible, possibly replacing an - //! any existing version of a map with the same name. - //! -+//! @param path Pointer to the file that is or will represent the map. -+//! - //! @param parms Reference to the parameters. See the ShMap_Parms struct for - //! for details and constructor defaults. Below is a detailed - //! explanation of the available options: -diff --git a/src/XrdSys/XrdSysLogPI.hh b/src/XrdSys/XrdSysLogPI.hh -index e1ff09686..953399b16 100644 ---- a/src/XrdSys/XrdSysLogPI.hh -+++ b/src/XrdSys/XrdSysLogPI.hh -@@ -59,7 +59,7 @@ typedef void (*XrdSysLogPI_t)(struct timeval const &mtime, - //! library identified by the "-l @library" command line option. This function - //! is called only once during loging initialization. - //! --//! @param cfgfn -> Configuration filename (nil if none). -+//! @param cfgn -> Configuration filename (nil if none). - //! @param argv -> command line arguments after "-+xrdlog". - //! @param argc number of command line arguments in argv. - //! -diff --git a/src/XrdSys/XrdSysLogger.hh b/src/XrdSys/XrdSysLogger.hh -index ccd9730ff..b33bf82ca 100644 ---- a/src/XrdSys/XrdSysLogger.hh -+++ b/src/XrdSys/XrdSysLogger.hh -@@ -139,7 +139,7 @@ int Bind(const char *path, int lfh=0); - //! Capture allows you to capture all messages (they are not routed). This is - //! a global setting so use with caution! - //! --//! @param tBase Pointer to the XrdOucTListFIFO where messages are saved. -+//! @param tFIFO Pointer to the XrdOucTListFIFO where messages are saved. - //! If the pointer is nil, capturing is turned off. - //----------------------------------------------------------------------------- - -diff --git a/src/XrdSys/XrdSysXAttr.hh b/src/XrdSys/XrdSysXAttr.hh -index 1c985c07c..bd4e79482 100644 ---- a/src/XrdSys/XrdSysXAttr.hh -+++ b/src/XrdSys/XrdSysXAttr.hh -@@ -155,7 +155,7 @@ virtual int List(AList **aPL, const char *Path, int fd=-1, int getSz=0) = 0; - //! attribute value which may contain binary data. - //! @param Path -> Path of the file whose attribute is to be set. - //! @param fd -> If >=0 is the file descriptor of the opened subject file. --//! @param isnew When !0 then the attribute must not exist (i.e. new). -+//! @param isNew When !0 then the attribute must not exist (i.e. new). - //! Otherwise, if it does exist, the value is replaced. In - //! either case, if it does not exist it should be created. - //! -diff --git a/src/XrdTls/XrdTls.hh b/src/XrdTls/XrdTls.hh -index d195dbd42..ca6268d9e 100644 ---- a/src/XrdTls/XrdTls.hh -+++ b/src/XrdTls/XrdTls.hh -@@ -110,7 +110,7 @@ static void SetDebug(int opts, msgCB_t logP); - //------------------------------------------------------------------------ - //! Convert SSL error to TLS::RC code. - //! --//! @param sslerr - the SSL error return code. -+//! @param sslrc - the SSL error return code. - //! - //! @return The corresponding TLS::RC code. - //------------------------------------------------------------------------ -@@ -120,7 +120,7 @@ static RC ssl2RC(int sslrc); - //------------------------------------------------------------------------ - //! Convert SSL error to text. - //! --//! @param sslerr - the SSL error return code. -+//! @param sslrc - the SSL error return code. - //! @param dflt - the default to be return when mapping does no exist. - //! - //! @return The corresponding text or the dflt string is returned. -diff --git a/src/XrdTls/XrdTlsSocket.hh b/src/XrdTls/XrdTlsSocket.hh -index d5bc85a54..232f4b704 100644 ---- a/src/XrdTls/XrdTlsSocket.hh -+++ b/src/XrdTls/XrdTlsSocket.hh -@@ -94,7 +94,7 @@ enum HS_Mode - //------------------------------------------------------------------------ - //! Accept an incoming TLS connection - //! --//! @param eWhy - If not nil, receives the associated error message. -+//! @param eMsg - If not nil, receives the associated error message. - //! - //! @return The appropriate TLS return code. - //------------------------------------------------------------------------ -diff --git a/src/XrdXrootd/XrdXrootdBridge.hh b/src/XrdXrootd/XrdXrootdBridge.hh -index acc68e656..bf2a6f366 100644 ---- a/src/XrdXrootd/XrdXrootdBridge.hh -+++ b/src/XrdXrootd/XrdXrootdBridge.hh -@@ -84,15 +84,15 @@ class Result; - //! created for each session or, if the protocol allows, be - //! shared by all sessions. It cannot be deleted until all - //! references to the object disappear (see the Result class). --//! linkP a pointer to the link object that the protocol driver -+//! @param linkP a pointer to the link object that the protocol driver - //! created to the client connection. --//! secP a pointer to the XrdSecEntity object that describes the -+//! @param seceP a pointer to the XrdSecEntity object that describes the - //! client's identity. --//! nameP An arbitrary 1-to-8 character client name. The Bridge will -+//! @param nameP An arbitrary 1-to-8 character client name. The Bridge will - //! uniquefy this name so that log file messages will track the - //! the associated client. The link's identity is set to - //! correspond to this name with additional information. --//! protP a 1-to-7 character name of the protocol using this bridge -+//! @param protP a 1-to-7 character name of the protocol using this bridge - //! (e.g. "http"). - //! - //! @return bridgeP a pointer to a new instance of this class if a bridge -@@ -179,7 +179,7 @@ virtual bool Disc() = 0; - //! must see the data prior to sending to the client (e.g. for encryption). - //! - //! @param fhandle the filehandle as returned by kXR_open. --//! @param mode When true, enables sendfile() otherwise it is disabled. -+//! @param seton When true, enables sendfile() otherwise it is disabled. - //! - //! @return =0 Sucessful. - //! @return <0 Call failed. The return code is -errno and usually will -@@ -207,7 +207,7 @@ virtual int setSF(kXR_char *fhandle, bool seton=false) = 0; - //! - //----------------------------------------------------------------------------- - --virtual void SetWait(int wime, bool notify=false) = 0; -+virtual void SetWait(int wtime, bool notify=false) = 0; - - /******************************************************************************/ - /* X r d X r o o t d : : B r i d g e : : C o n t e x t */ -diff --git a/src/XrdXrootd/XrdXrootdGPFile.hh b/src/XrdXrootd/XrdXrootdGPFile.hh -index b58d0d29d..48e4fa988 100644 ---- a/src/XrdXrootd/XrdXrootdGPFile.hh -+++ b/src/XrdXrootd/XrdXrootdGPFile.hh -@@ -145,7 +145,7 @@ virtual void getFile(const XrdXrootdGPFileInfo &gargs, - //! reflected by calling pargs.Completed() with an error code and msg. - //----------------------------------------------------------------------------- - --virtual void putFile(const XrdXrootdGPFileInfo &gargs, -+virtual void putFile(const XrdXrootdGPFileInfo &pargs, - const XrdSecEntity *client=0) = 0; - - //------------------------------------------------------------------------------ --- -2.37.2 - -From 73fa7967ea8f03f54dd9eb4ac690fb28a791ca16 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Sun, 28 Aug 2022 12:08:41 +0200 -Subject: [PATCH] Address some warnings from Doxygen - ---- - src/XrdCeph/src/XrdCeph/XrdCephOssFile.hh | 2 +- - src/XrdCeph/src/XrdCeph/XrdCephXAttr.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/XrdCeph/src/XrdCeph/XrdCephOssFile.hh b/src/XrdCeph/src/XrdCeph/XrdCephOssFile.hh -index 094ed84c..6b0425ea 100644 ---- a/src/XrdCeph/src/XrdCeph/XrdCephOssFile.hh -+++ b/src/XrdCeph/src/XrdCeph/XrdCephOssFile.hh -@@ -59,7 +59,7 @@ public: - virtual int Close(long long *retsz=0); - virtual ssize_t Read(off_t offset, size_t blen); - virtual ssize_t Read(void *buff, off_t offset, size_t blen); -- virtual int Read(XrdSfsAio *aoip); -+ virtual int Read(XrdSfsAio *aiop); - virtual ssize_t ReadRaw(void *, off_t, size_t); - virtual int Fstat(struct stat *buff); - virtual ssize_t Write(const void *buff, off_t offset, size_t blen); -diff --git a/src/XrdCeph/src/XrdCeph/XrdCephXAttr.hh b/src/XrdCeph/src/XrdCeph/XrdCephXAttr.hh -index 0dfb9f5e..ed6f4d39 100644 ---- a/src/XrdCeph/src/XrdCeph/XrdCephXAttr.hh -+++ b/src/XrdCeph/src/XrdCeph/XrdCephXAttr.hh -@@ -136,7 +136,7 @@ public: - //! attribute value which may contain binary data. - //! @param Path -> Path of the file whose attribute is to be set. - //! @param fd -> If >=0 is the file descriptor of the opened subject file. -- //! @param isnew When !0 then the attribute must not exist (i.e. new). -+ //! @param isNew When !0 then the attribute must not exist (i.e. new). - //! Otherwise, if it does exist, the value is replaced. In - //! either case, if it does not exist it should be created. - //! --- -2.37.2 - diff --git a/0001-Check-all-sizes-8-16-32-64-in-atomic-check.patch b/0001-Check-all-sizes-8-16-32-64-in-atomic-check.patch new file mode 100644 index 0000000..e17997f --- /dev/null +++ b/0001-Check-all-sizes-8-16-32-64-in-atomic-check.patch @@ -0,0 +1,50 @@ +From 98265bd6b743a542e448bbfdcc61c995cb69bbe6 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 20 Oct 2022 09:02:48 +0200 +Subject: [PATCH] Check all sizes (8, 16, 32, 64) in check Check + operator++ in check Add ${ATOMIC_LIBRARY} to libXrdServer + dependencies + +--- + cmake/XRootDSystemCheck.cmake | 12 +++++------- + src/XrdServer.cmake | 1 + + 2 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/cmake/XRootDSystemCheck.cmake b/cmake/XRootDSystemCheck.cmake +index 52f9ba641..8af868863 100644 +--- a/cmake/XRootDSystemCheck.cmake ++++ b/cmake/XRootDSystemCheck.cmake +@@ -149,13 +149,11 @@ function(check_working_cxx_atomics varname) + #include + #include + int main() { +- std::atomic a1(0); +- int a1val = a1.load(); +- (void)a1val; +- std::atomic a2(0); +- uint64_t a2val = a2.load(std::memory_order_relaxed); +- (void)a2val; +- return 0; ++ std::atomic a1; ++ std::atomic a2; ++ std::atomic a3; ++ std::atomic a4; ++ return a1++ + a2++ + a3++ + a4++; + } + " ${varname}) + set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) +diff --git a/src/XrdServer.cmake b/src/XrdServer.cmake +index 4006976d5..d5d2e4533 100644 +--- a/src/XrdServer.cmake ++++ b/src/XrdServer.cmake +@@ -191,6 +191,7 @@ target_link_libraries( + XrdUtils + ${CMAKE_DL_LIBS} + ${CMAKE_THREAD_LIBS_INIT} ++ ${ATOMIC_LIBRARY} + ${EXTRA_LIBS} + ${SOCKET_LIBRARY} ) + +-- +2.37.3 + diff --git a/sources b/sources index 46eab4b..cd781dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-5.5.0.tar.gz) = d13d76be54eacc097363cd1c06448f87bffdd32c81eaad12b4c3321be31c7b221ef34b1bf5da50ee5128d9682e13dc670554317c29c13607c246c781a1fefffe +SHA512 (xrootd-5.5.1.tar.gz) = e929db1026d4ae8016667be1c8a939a600ef6a67a9d34d811e89061d1972103aec226cb8d3a0e6bd7706d814c901b46b6d4d763f28e92358c924520e4e754982 diff --git a/xrootd.spec b/xrootd.spec index bff8f03..e02dec9 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -13,7 +13,7 @@ Name: xrootd Epoch: 1 -Version: 5.5.0 +Version: 5.5.1 Release: 1%{?dist} Summary: Extended ROOT file server @@ -22,9 +22,10 @@ URL: https://xrootd.slac.stanford.edu/ Source0: https://xrootd.slac.stanford.edu/download/v%{version}/%{name}-%{version}.tar.gz # Disable LTO for XrdPosix on 32 bit architectures Patch0: 0001-Disable-LTO-for-XrdPosix-on-32-bit-architectures.patch -# https://github.com/xrootd/xrootd/pull/1774 -# https://github.com/xrootd/xrootd-ceph/pull/19 -Patch1: 0001-Address-some-warnings-from-Doxygen.patch +# Check all sizes (8, 16, 32, 64) in check +# Check operator++ in check +# https://github.com/xrootd/xrootd/pull/1806 +Patch1: 0001-Check-all-sizes-8-16-32-64-in-atomic-check.patch %if %{?rhel}%{!?rhel:0} == 7 BuildRequires: cmake3 >= 3.6 @@ -681,6 +682,12 @@ fi %doc %{_pkgdocdir} %changelog +* Wed Oct 19 2022 Mattias Ellert - 1:5.5.1-1 +- Update to version 5.5.1 +- Drop doxygen patch accepted upstream +- Check all sizes (8, 16, 32, 64) in check +- Check operator++ in check + * Fri Aug 26 2022 Mattias Ellert - 1:5.5.0-1 - Update to version 5.5.0 - Drop patches accepted upstream