summaryrefslogtreecommitdiff
path: root/vos
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2014-04-29 19:25:03 +0000
committerPedro Giffuni <pfg@apache.org>2014-04-29 19:25:03 +0000
commit28206a7cb43aff5adb10f8235ad1680c3941ee3e (patch)
tree89886aa22af7483120081efc38a138d737651703 /vos
parentc3f20ae9a447f50517fe545a53de91d412c3337c (diff)
Many spelling fixes: directories r* - z*.
Attempt to clean up most but certainly not all the spelling mistakes that found home in OpenOffice through decades. We could probably blame the international nature of the code but it is somewhat shameful that this wasn't done before.
Notes
Notes: merged as: 820a29950b3085a713026995fdc43e32b6ded5f7
Diffstat (limited to 'vos')
-rw-r--r--vos/inc/vos/pipe.hxx8
-rw-r--r--vos/inc/vos/process.hxx14
-rw-r--r--vos/inc/vos/signal.hxx2
-rw-r--r--vos/inc/vos/socket.hxx22
-rw-r--r--vos/inc/vos/thread.hxx4
-rw-r--r--vos/source/pipe.cxx8
-rw-r--r--vos/source/socket.cxx8
7 files changed, 33 insertions, 33 deletions
diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index 65fef198c7b9..5a32468481e1 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.hxx
@@ -172,13 +172,13 @@ public:
@param pBuffer [in] Points to a buffer that contains the send-data.
@param BytesToSend [in] The number of bytes to send. pBuffer must have at least
this size.
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
sal_Int32 SAL_CALL send(const void* pBuffer, sal_uInt32 BytesToSend);
- /** Delivers a constant decribing the last error for the pipe system.
- @return ENONE if no error occured, invalid_PipeError if
- an unknown (unmapped) error occured, otherwise an enum describing the
+ /** Delivers a constant describing the last error for the pipe system.
+ @return ENONE if no error occurred, invalid_PipeError if
+ an unknown (unmapped) error occurred, otherwise an enum describing the
error.
*/
TPipeError SAL_CALL getError() const;
diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index 8b0e7408e46e..c03387296dd4 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -86,7 +86,7 @@ public:
/** startup child processes.
@see OStartupInfo
Used for starting an monitoring child processes with special features:
- <ul><li>setting enviroments,
+ <ul><li>setting environments,
<li>setting working directories,
<li>setting user rights and security,
<li>providing ioresources like file descriptors and sockets.</ul>
@@ -116,7 +116,7 @@ public:
enum TProcessError {
E_None = osl_Process_E_None, /* no error */
E_NotFound = osl_Process_E_NotFound, /* image not found */
- E_TimedOut = osl_Process_E_TimedOut, /* timout occured */
+ E_TimedOut = osl_Process_E_TimedOut, /* timout occurred */
E_NoPermission = osl_Process_E_NoPermission, /* permission denied */
E_Unknown = osl_Process_E_Unknown, /* unknown error */
E_InvalidError = osl_Process_E_InvalidError /* unmapped error */
@@ -171,7 +171,7 @@ public:
If there are any ioresources provided from the calling process, this
function returns only, if the child process calls OStartupInfo::acceptIOResource().
@param Options [in] describes the execution mode.
- @return only not eNONE, if too much enviroments are added.
+ @return only not eNONE, if too much environments are added.
@see OStartupInfo::acceptIOResource
*/
TProcessError SAL_CALL execute(TProcessOption Options,
@@ -186,7 +186,7 @@ public:
function returns only, if the child process calls OStartupInfo::acceptIOResource().
@param Options [in] describes the execution mode.
@param Security [in] is a given security object for one logged in user.
- @return eNONE, if the proccess could be executed, otherwise an errorcode.
+ @return eNONE, if the process could be executed, otherwise an errorcode.
@see OStartupInfo::acceptIOResource
*/
TProcessError SAL_CALL execute(TProcessOption Options,
@@ -228,7 +228,7 @@ public:
enum TStartupError {
E_None = osl_Process_E_None, /* no error */
E_NotFound = osl_Process_E_NotFound, /* image not found */
- E_TimedOut = osl_Process_E_TimedOut, /* timout occured */
+ E_TimedOut = osl_Process_E_TimedOut, /* timout occurred */
E_NoPermission = osl_Process_E_NoPermission, /* permission denied */
E_Unknown = osl_Process_E_Unknown, /* unknown error */
E_InvalidError = osl_Process_E_InvalidError /* unmapped error */
@@ -256,11 +256,11 @@ public:
TStartupError SAL_CALL getExecutableFile(::rtl::OUString& strImageName)
const;
- /** Get the value of one enviroment variable.
+ /** Get the value of one environment variable.
@param Name [in] denotes the name of the variable to get.
@param Buffer [out] is the buffer where the value of this variable is returned.
@param Max [in] is the size of this buffer.
- @return eNONE, if the variable exist in the enviroment, otherwise False.
+ @return eNONE, if the variable exist in the environment, otherwise False.
*/
TStartupError SAL_CALL getEnvironment(const ::rtl::OUString& strVar, ::rtl::OUString& strValue);
};
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index 603b5e03b7ae..e3eaceb15f7c 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.hxx
@@ -72,7 +72,7 @@ public:
/// Constructor
OSignalHandler();
- /// Destructor kills thread if neccessary
+ /// Destructor kills thread if necessary
virtual ~OSignalHandler();
static TSignalAction SAL_CALL raise(sal_Int32 Signal, void *pData = 0);
diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index 8814007283cc..cb512da5e352 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.hxx
@@ -175,7 +175,7 @@ public:
enum TResult {
TResult_Ok = osl_Socket_Ok, /* successful completion */
- TResult_Error = osl_Socket_Error, /* error occured, check osl_getLastSocketError() for details */
+ TResult_Error = osl_Socket_Error, /* error occurred, check osl_getLastSocketError() for details */
TResult_TimedOut = osl_Socket_TimedOut, /* blocking operation timed out */
TResult_Interrupted = osl_Socket_Interrupted, /* blocking operation was interrupted */
TResult_InProgress = osl_Socket_InProgress /* nonblocking operation is in progress */
@@ -566,7 +566,7 @@ public:
You can specify a timeout-value in seconds/nanoseconds that denotes
how sal_Int32 the operation will block if the Socket is not ready.
@return True if read operations (recv, recvFrom, accept) on the Socket
- will NOT block; False if it would block or if an error occured.
+ will NOT block; False if it would block or if an error occurred.
@param pTimeout if 0, the operation will block without a timeout. Otherwise
the specified amout of time.
@@ -577,7 +577,7 @@ public:
You can specify a timeout-value in seconds/nanoseconds that denotes
how sal_Int32 the operation will block if the Socket is not ready.
@return True if send operations (send, sendTo) on the Socket
- will NOT block; False if it would block or if an error occured.
+ will NOT block; False if it would block or if an error occurred.
@param pTimeout if 0, the operation will block without a timeout. Otherwise
the specified amout of time.
@@ -589,7 +589,7 @@ public:
how sal_Int32 the operation will block if the Socket has no pending OOB data.
@return True if OOB-request operations (recv with appropriate flags)
- on the Socket will NOT block; False if it would block or if an error occured.
+ on the Socket will NOT block; False if it would block or if an error occurred.
@param pTimeout if 0, the operation will block without a timeout. Otherwise
the specified amout of time.
@@ -633,7 +633,7 @@ public:
</ul>
@return The size of the attribute copied into pBuffer ot -1 if an error
- occured.
+ occurred.
*/
sal_Int32 SAL_CALL getOption(TSocketOption Option,
void* pBuffer,
@@ -779,7 +779,7 @@ public:
sal_Int32 SAL_CALL setRecvBufSize(sal_Int32 size =-1) const;
/** Disables the Nagle algorithm for send coalescing. (Do not
- collect data until a packet is full, instead send immediatly.
+ collect data until a packet is full, instead send immediately.
This increases network traffic but might improve response-times.)
@param opt 1 sets, 0 resets, -1 won't change anything
@return the previous setting
@@ -794,9 +794,9 @@ public:
*/
void SAL_CALL getError(::rtl::OUString& strError) const;
- /** Delivers a constant decribing the last error for the socket system.
- @return ENONE if no error occured, invalid_SocketError if
- an unknown (unmapped) error occured, otherwise an enum describing the
+ /** Delivers a constant describing the last error for the socket system.
+ @return ENONE if no error occurred, invalid_SocketError if
+ an unknown (unmapped) error occurred, otherwise an enum describing the
error.
*/
TSocketError SAL_CALL getError() const;
@@ -918,7 +918,7 @@ public:
<li> TMsg_MaxIOVLen
</ul>
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
sal_Int32 SAL_CALL send(const void* pBuffer,
sal_uInt32 BytesToSend,
@@ -1110,7 +1110,7 @@ public:
<li> TMsg_MaxIOVLen
</ul>
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
sal_Int32 SAL_CALL sendTo(const OSocketAddr& ReceiverAddr,
const void* pBuffer,
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index 663322a7738c..ed11f61d9a2a 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.hxx
@@ -87,7 +87,7 @@ public:
/// Constructor
OThread();
- /// Destructor kills thread if neccessary
+ /// Destructor kills thread if necessary
virtual ~OThread();
/** Create running instance of a thread.
@@ -211,7 +211,7 @@ public:
virtual ~OThreadData();
/** Set the data associated with the data key.
- @returns True if operation was successfull
+ @returns True if operation was successful
*/
sal_Bool SAL_CALL setData(void *pData);
diff --git a/vos/source/pipe.cxx b/vos/source/pipe.cxx
index 0e65313c8759..9f66835f21fd 100644
--- a/vos/source/pipe.cxx
+++ b/vos/source/pipe.cxx
@@ -346,7 +346,7 @@ sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
{
VOS_ASSERT(m_pPipeRef && (*m_pPipeRef)());
- /* loop until all desired bytes were read or an error occured */
+ /* loop until all desired bytes were read or an error occurred */
sal_Int32 BytesRead= 0;
sal_Int32 BytesToRead= n;
while (BytesToRead > 0)
@@ -356,7 +356,7 @@ sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
pBuffer,
BytesToRead);
- /* error occured? */
+ /* error occurred? */
if(RetVal <= 0)
{
break;
@@ -377,7 +377,7 @@ sal_Int32 OStreamPipe::write(const void* pBuffer, sal_uInt32 n)
{
VOS_ASSERT(m_pPipeRef && (*m_pPipeRef)());
- /* loop until all desired bytes were send or an error occured */
+ /* loop until all desired bytes were send or an error occurred */
sal_Int32 BytesSend= 0;
sal_Int32 BytesToSend= n;
while (BytesToSend > 0)
@@ -388,7 +388,7 @@ sal_Int32 OStreamPipe::write(const void* pBuffer, sal_uInt32 n)
pBuffer,
BytesToSend);
- /* error occured? */
+ /* error occurred? */
if(RetVal <= 0)
{
break;
diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx
index 06b89aa3026d..45371c90a756 100644
--- a/vos/source/socket.cxx
+++ b/vos/source/socket.cxx
@@ -1412,7 +1412,7 @@ sal_Int32 OStreamSocket::read(void* pBuffer, sal_uInt32 n) const
return -1;
}
- /* loop until all desired bytes were read or an error occured */
+ /* loop until all desired bytes were read or an error occurred */
sal_uInt32 BytesRead= 0;
sal_uInt32 BytesToRead= n;
while (BytesToRead > 0)
@@ -1423,7 +1423,7 @@ sal_Int32 OStreamSocket::read(void* pBuffer, sal_uInt32 n) const
BytesToRead,
osl_Socket_MsgNormal);
- /* error occured? */
+ /* error occurred? */
if(RetVal <= 0)
{
break;
@@ -1459,7 +1459,7 @@ sal_Int32 OStreamSocket::write(const void* pBuffer, sal_uInt32 n)
return -1;
}
- /* loop until all desired bytes were send or an error occured */
+ /* loop until all desired bytes were send or an error occurred */
sal_uInt32 BytesSend= 0;
sal_uInt32 BytesToSend= n;
while (BytesToSend > 0)
@@ -1471,7 +1471,7 @@ sal_Int32 OStreamSocket::write(const void* pBuffer, sal_uInt32 n)
BytesToSend,
osl_Socket_MsgNormal);
- /* error occured? */
+ /* error occurred? */
if(RetVal <= 0)
{
break;