summaryrefslogtreecommitdiff
path: root/sal/inc/osl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/inc/osl')
-rw-r--r--sal/inc/osl/conditn.h2
-rw-r--r--sal/inc/osl/endian.h2
-rw-r--r--sal/inc/osl/file.h8
-rw-r--r--sal/inc/osl/file.hxx4
-rw-r--r--sal/inc/osl/pipe_decl.hxx8
-rw-r--r--sal/inc/osl/process.h18
-rw-r--r--sal/inc/osl/security.h2
-rw-r--r--sal/inc/osl/semaphor.h2
-rw-r--r--sal/inc/osl/semaphor.hxx2
-rw-r--r--sal/inc/osl/socket.h24
-rw-r--r--sal/inc/osl/socket_decl.hxx22
-rw-r--r--sal/inc/osl/thread.hxx2
12 files changed, 48 insertions, 48 deletions
diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h
index 0e130c60e9ef..0b2184c5467c 100644
--- a/sal/inc/osl/conditn.h
+++ b/sal/inc/osl/conditn.h
@@ -35,7 +35,7 @@ typedef void* oslCondition;
typedef enum {
osl_cond_result_ok, /* successful completion */
- osl_cond_result_error, /* error occured, check osl_getLastSocketError() for details */
+ osl_cond_result_error, /* error occurred, check osl_getLastSocketError() for details */
osl_cond_result_timeout, /* blocking operation timed out */
osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslConditionResult;
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 476fd6eb93a3..27e678a2a624 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -157,7 +157,7 @@ extern "C" {
#elif defined _BIG_ENDIAN
# define OSL_BIGENDIAN
#else
-# error undetermined endianess
+# error undetermined endianness
#endif
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index be5add4fcb8f..3e0c74be4ac1 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -57,7 +57,7 @@ contain only ASCII characters<p>
case preserving or not. The operating system implementation itself should
determine if it can map case-insensitive paths. The case correct notation of
a filename or file path is part of the "File Info". This case correct name
-can be used as a unique key if neccessary.<p>
+can be used as a unique key if necessary.<p>
4. Obtaining information about files or volumes is controlled by a
bitmask which specifies which fields are of interest. Due to performance
@@ -336,7 +336,7 @@ typedef enum {
#define osl_File_Attribute_OthRead 0x00001000
#define osl_File_Attribute_OthExe 0x00002000
-/* Flags specifying which fields to retreive by osl_getFileStatus */
+/* Flags specifying which fields to retrieve by osl_getFileStatus */
#define osl_FileStatus_Mask_Type 0x00000001
#define osl_FileStatus_Mask_Attributes 0x00000002
@@ -557,7 +557,7 @@ oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle
#define osl_Volume_Attribute_Case_Is_Preserved 0x00000040L
#define osl_Volume_Attribute_Case_Sensitive 0x00000080L
-/* Flags specifying which fields to retreive by osl_getVolumeInfo */
+/* Flags specifying which fields to retrieve by osl_getVolumeInfo */
#define osl_VolumeInfo_Mask_Attributes 0x00000001L
#define osl_VolumeInfo_Mask_TotalSpace 0x00000002L
@@ -584,7 +584,7 @@ struct _oslVolumeInfo {
sal_uInt32 uValidFields;
/** Attributes of the volume (remote and/or removable) */
sal_uInt32 uAttributes;
-/** Total availiable space on the volume for the current process/user */
+/** Total available space on the volume for the current process/user */
sal_uInt64 uTotalSpace;
/** Used space on the volume for the current process/user */
sal_uInt64 uUsedSpace;
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index bd9c9f04b05d..ff745c7c5321 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -476,7 +476,7 @@ public:
/** Constructor.
@param nMask
- Set of flaggs decribing the demanded information.
+ Set of flaggs describing the demanded information.
*/
VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
@@ -750,7 +750,7 @@ public:
/** Constructor.
@param nMask
- Set of flaggs decribing the demanded information.
+ Set of flaggs describing the demanded information.
*/
FileStatus( sal_uInt32 nMask ): _nMask( nMask )
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index 55698bedef5f..3310867bca27 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -128,9 +128,9 @@ public:
inline oslPipeError SAL_CALL accept(StreamPipe& Connection);
- /** 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.
*/
inline oslPipeError SAL_CALL getError() const;
@@ -203,7 +203,7 @@ 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.
*/
inline sal_Int32 SAL_CALL send(const void* pBuffer, sal_Int32 BytesToSend) const;
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index c5eed8216e54..c4783648b569 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -64,7 +64,7 @@ typedef sal_uInt32 oslProcessExitCode;
typedef enum {
osl_Process_E_None, /* no error */
osl_Process_E_NotFound, /* image not found */
- osl_Process_E_TimedOut, /* timout occured */
+ osl_Process_E_TimedOut, /* timout occurred */
osl_Process_E_NoPermission, /* permission denied */
osl_Process_E_Unknown, /* unknown error */
osl_Process_E_InvalidError, /* unmapped error */
@@ -138,7 +138,7 @@ typedef void* oslProcess;
the process will be started in the context of the current user.
@param ustrDirectory
- [in] The file URL of the working directory of the new proces. If the specified directory
+ [in] The file URL of the working directory of the new process. If the specified directory
does not exist or is inaccessible the working directory of the newly created process
is undefined. If this parameter is NULL or the caller provides an empty string the
new process will have the same current working directory as the calling process.
@@ -153,7 +153,7 @@ typedef void* oslProcess;
[in] The number of environment variables to set.
@param pProcess
- [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process.
+ [out] Pointer to a oslProcess variable, which receives the handle of the newly created process.
This parameter must not be NULL.
@return
@@ -208,7 +208,7 @@ oslProcessError SAL_CALL osl_executeProcess(
the process will be started in the context of the current user.
@param ustrDirectory
- [in] The file URL of the working directory of the new proces. If the specified directory
+ [in] The file URL of the working directory of the new process. If the specified directory
does not exist or is inaccessible the working directory of the newly created process
is undefined. If this parameter is NULL or the caller provides an empty string the
new process will have the same current working directory as the calling process.
@@ -223,7 +223,7 @@ oslProcessError SAL_CALL osl_executeProcess(
[in] The number of environment variables to set.
@param pProcess
- [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process.
+ [out] Pointer to a oslProcess variable, which receives the handle of the newly created process.
This parameter must not be NULL.
@param pChildInputWrite
@@ -318,7 +318,7 @@ oslProcessError SAL_CALL osl_joinProcess(oslProcess Process);
@return
osl_Process_E_None on success
osl_Process_E_TimedOut waiting for the child process timed out
- osl_Process_E_Unknown an error occured or the parameter are invalid
+ osl_Process_E_Unknown an error occurred or the parameter are invalid
@see osl_executeProcess
*/
@@ -378,13 +378,13 @@ oslProcessError SAL_CALL osl_getCommandArg(sal_uInt32 nArg, rtl_uString **strCom
*/
void SAL_CALL osl_setCommandArgs (int argc, char **argv);
-/** Get the value of one enviroment variable.
+/** Get the value of one environment variable.
@param strVar [in] denotes the name of the variable to get.
@param strValue [out] string that receives the value of environment variable.
*/
oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *strVar, rtl_uString **strValue);
-/** Set the value of one enviroment variable.
+/** Set the value of one environment variable.
@param strVar [in] denotes the name of the variable to set.
@param strValue [in] string of the new value of environment variable.
@@ -392,7 +392,7 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *strVar, rtl_uString **s
*/
oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *strVar, rtl_uString *strValue);
-/** Unsets the value of one enviroment variable.
+/** Unsets the value of one environment variable.
@param strVar [in] denotes the name of the variable to unset.
@since UDK 3.2.13
diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h
index d2d9b47c8326..5eed5e7a0808 100644
--- a/sal/inc/osl/security.h
+++ b/sal/inc/osl/security.h
@@ -74,7 +74,7 @@ oslSecurityError SAL_CALL osl_loginUser(
the maped drive on this server.
@param strUserName [in] denotes the name of the user to logg in.
@param strPasswd [in] the password for this user.
- @param strFileServer [in] denotes the file server on wich the user is logged in.
+ @param strFileServer [in] denotes the file server on which the user is logged in.
@param pSecurity [out] returns the security handle if user could be logged in.
@return osl_Security_E_None if user could be logged in, otherwise an error-code.
@see osl_freeSecurityHandle
diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h
index d3e1159ce405..1a81751a7de1 100644
--- a/sal/inc/osl/semaphor.h
+++ b/sal/inc/osl/semaphor.h
@@ -39,7 +39,7 @@ typedef void* oslSemaphore;
@param InitialCount denotes the starting value the semaphore. If you set it to
zero, the first acquire() blocks. Otherwise InitialCount acquire()s are
- immedeatly successfull.
+ immedeatly successful.
@return 0 if the semaphore could not be created, otherwise a handle to the sem.
*/
oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount);
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index 9ae6dca14178..b768a96139b8 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -43,7 +43,7 @@ namespace osl
/** Creates a semaphore.<BR>
@param InitialCount denotes the starting value the semaphore. If you set it to
zero, the first acquire() blocks. Otherwise InitialCount acquire()s are
- immedeatly successfull.
+ immedeatly successful.
@return 0 if the semaphore could not be created, otherwise a handle to the sem.
*/
diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h
index 175688dcec5c..28db6c76b5e2 100644
--- a/sal/inc/osl/socket.h
+++ b/sal/inc/osl/socket.h
@@ -190,7 +190,7 @@ typedef enum {
*/
typedef enum {
osl_Socket_Ok, /* successful completion */
- osl_Socket_Error, /* error occured, check osl_getLastSocketError() for details */
+ osl_Socket_Error, /* error occurred, check osl_getLastSocketError() for details */
osl_Socket_TimedOut, /* blocking operation timed out */
osl_Socket_Interrupted, /* blocking operation was interrupted */
osl_Socket_InProgress, /* nonblocking operation is in progress */
@@ -545,7 +545,7 @@ sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket Socket,
<li><code>osl_Socket_MsgMaxIOVLen</code>
</ul>
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
sal_Int32 SAL_CALL osl_sendSocket(oslSocket Socket,
const void* pBuffer,
@@ -575,7 +575,7 @@ sal_Int32 SAL_CALL osl_sendSocket(oslSocket Socket,
<li><code>osl_Socket_MsgMaxIOVLen</code>
</ul>
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
sal_Int32 SAL_CALL osl_sendToSocket(oslSocket Socket,
oslSocketAddr ReceiverAddr,
@@ -589,7 +589,7 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket Socket,
how long the operation will block if the Socket is not ready.
@return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
- will NOT block; <code>sal_False</code> if it would block or if an error occured.
+ will NOT block; <code>sal_False</code> if it would block or if an error occurred.
@param Socket the Socket to perfom the operation on.
@param pTimeout if NULL, the operation will block without a timeout.
@@ -600,7 +600,7 @@ sal_Bool SAL_CALL osl_isReceiveReady(oslSocket Socket, const TimeValue* pTimeout
You can specify a timeout-value in seconds/microseconds that denotes
how long the operation will block if the Socket is not ready.
@return <code>sal_True</code> if send operations (send, sendTo) on the Socket
- will NOT block; <code>sal_False</code> if it would block or if an error occured.
+ will NOT block; <code>sal_False</code> if it would block or if an error occurred.
@param Socket the Socket to perfom the operation on.
@param pTimeout if NULL, the operation will block without a timeout. Otherwise
@@ -612,7 +612,7 @@ sal_Bool SAL_CALL osl_isSendReady(oslSocket Socket, const TimeValue* pTimeout);
You can specify a timeout-value in seconds/microseconds that denotes
how long the operation will block if the Socket has no pending OOB data.
@return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
- on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occured.
+ on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occurred.
@param Socket the Socket to perfom the operation on.
@param pTimeout if NULL, the operation will block without a timeout.
@@ -700,7 +700,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
<li><code>osl_Socket_OptionTcpNoDelay</code><br>
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 latency-times.)
1 = disables the algorithm, 0 = keeps it enabled.
</ul>
@@ -712,7 +712,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
@param BufferSize contains the length of the Buffer.
- @return -1 if an error occured or else the size of the data copied into
+ @return -1 if an error occurred or else the size of the data copied into
pBuffer.
@see osl_setSocketOption()
*/
@@ -773,7 +773,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket);
<li> osl_Socket_TypeRaw
<li> osl_Socket_TypeRdm
<li> osl_Socket_TypeSeqPacket
- <li> osl_invalid_SocketType, if an error occured
+ <li> osl_invalid_SocketType, if an error occurred
</ul>
*/
@@ -784,10 +784,10 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket Socket);
*/
void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **strError);
-/** returns a constant decribing the last error for the socket system.
- @return <code>osl_Socket_E_NONE</code> if no error occured,
+/** returns a constant describing the last error for the socket system.
+ @return <code>osl_Socket_E_NONE</code> if no error occurred,
<code>osl_invalid_SocketError</code> if an unknown (unmapped)
- error occured, otherwise an enum describing the error.
+ error occurred, otherwise an enum describing the error.
*/
oslSocketError SAL_CALL osl_getLastSocketError(oslSocket Socket);
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 4830590d90b9..136e61925f61 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -272,7 +272,7 @@ namespace osl
You can specify a timeout-value in seconds/nanoseconds that denotes
how the operation will block if the Socket is not ready.
@return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
- will NOT block; <code>sal_False</code> if it would block or if an error occured.
+ will NOT block; <code>sal_False</code> 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.
@@ -284,7 +284,7 @@ namespace osl
You can specify a timeout-value in seconds/nanoseconds that denotes
how the operation will block if the Socket is not ready.
@return <code>sal_True</code> if send operations (send, sendTo) on the Socket
- will NOT block; <code>sal_False</code> if it would block or if an error occured.
+ will NOT block; <code>sal_False</code> 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.
@@ -299,7 +299,7 @@ namespace osl
@return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
on the Socket will NOT block; <code>sal_False</code> if it would block or if
- an error occured.
+ an error occurred.
@param pTimeout if 0, the operation will block without a timeout. Otherwise
the specified amout of time.
@@ -315,7 +315,7 @@ namespace osl
<li> <code>osl_Socket_TypeRaw</code>
<li> <code>osl_Socket_TypeRdm</code>
<li> <code>osl_Socket_TypeSeqPacket</code>
- <li> <code>osl_invalid_SocketType</code>, if an error occured
+ <li> <code>osl_invalid_SocketType</code>, if an error occurred
</ul>
*/
inline oslSocketType SAL_CALL getType() const;
@@ -380,7 +380,7 @@ namespace osl
<li><code>osl_Socket_OptionTcpNoDelay</code><br>
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 latency-times.)
1 = disables the algorithm, 0 = keeps it enabled.
</ul>
@@ -399,7 +399,7 @@ namespace osl
<li><code>osl_Socket_LevelTcp</code> : Level of Transmission Control Protocol
</ul>
@return The size of the attribute copied into pBuffer or -1 if an error
- occured.
+ occurred.
*/
inline sal_Int32 SAL_CALL getOption(
oslSocketOption Option,
@@ -481,10 +481,10 @@ namespace osl
*/
inline void SAL_CALL clearError() const;
- /** returns a constant decribing the last error for the socket system.
+ /** returns a constant describing the last error for the socket system.
- @return osl_Socket_E_NONE if no error occured, invalid_SocketError if
- an unknown (unmapped) error occured, otherwise an enum describing the
+ @return osl_Socket_E_NONE if no error occurred, invalid_SocketError if
+ an unknown (unmapped) error occurred, otherwise an enum describing the
error.
@see osl_getLastSocketError()
*/
@@ -574,7 +574,7 @@ namespace osl
<li><code>osl_Socket_MsgMaxIOVLen</code>
</ul>
- @return the number of transfered bytes. It may be less than BytesToSend.
+ @return the number of transferred bytes. It may be less than BytesToSend.
*/
sal_Int32 SAL_CALL send(const void* pBuffer,
sal_uInt32 BytesToSend,
@@ -705,7 +705,7 @@ namespace osl
<li><code>osl_Socket_MsgMaxIOVLen</code>
</ul>
- @return the number of transfered bytes.
+ @return the number of transferred bytes.
*/
inline sal_Int32 SAL_CALL sendTo( const SocketAddr& ReceiverAddr,
const void* pBuffer,
diff --git a/sal/inc/osl/thread.hxx b/sal/inc/osl/thread.hxx
index 5755e5ed5209..b57f7b617f55 100644
--- a/sal/inc/osl/thread.hxx
+++ b/sal/inc/osl/thread.hxx
@@ -202,7 +202,7 @@ public:
}
/** 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)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:43:47 +0000