From 36655b870c09e090b515011961c36fabd3f70e37 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 16 Jul 2021 13:27:00 +0200 Subject: cpukit: occured -> occurred --- cpukit/include/rtems/score/coremsgimpl.h | 8 ++++---- cpukit/include/rtems/score/corerwlockimpl.h | 2 +- cpukit/include/rtems/score/coresemimpl.h | 2 +- cpukit/include/rtems/score/heapimpl.h | 2 +- cpukit/include/rtems/score/mrspimpl.h | 4 ++-- cpukit/include/rtems/score/objectimpl.h | 8 ++++---- cpukit/include/rtems/score/profiling.h | 2 +- cpukit/include/rtems/score/protectedheap.h | 2 +- cpukit/libblock/src/bdbuf.c | 2 +- cpukit/libdrvmgr/drvmgr.c | 2 +- cpukit/libdrvmgr/drvmgr_unregister.c | 2 +- cpukit/libfs/src/dosfs/fat.c | 16 ++++++++-------- cpukit/libfs/src/dosfs/fat_fat_operations.c | 8 ++++---- cpukit/libfs/src/dosfs/fat_file.c | 20 ++++++++++---------- cpukit/libfs/src/dosfs/msdos_create.c | 2 +- cpukit/libfs/src/dosfs/msdos_dir.c | 4 ++-- cpukit/libfs/src/dosfs/msdos_file.c | 10 +++++----- cpukit/libfs/src/dosfs/msdos_init.c | 2 +- cpukit/libfs/src/dosfs/msdos_initsupp.c | 2 +- cpukit/libfs/src/dosfs/msdos_misc.c | 18 +++++++++--------- cpukit/score/cpu/mips/cpu_asm.S | 4 ++-- cpukit/score/cpu/nios2/nios2-iic-low-level.S | 4 ++-- cpukit/score/src/heapallocate.c | 2 +- 23 files changed, 64 insertions(+), 64 deletions(-) (limited to 'cpukit') diff --git a/cpukit/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h index 6f6a01bea6..161cf8f124 100644 --- a/cpukit/include/rtems/score/coremsgimpl.h +++ b/cpukit/include/rtems/score/coremsgimpl.h @@ -261,7 +261,7 @@ Status_Control _CORE_message_queue_Broadcast( * @retval STATUS_MESSAGE_INVALID_SIZE The message size was too big. * @retval STATUS_TOO_MANY No message buffers were available. * @retval STATUS_MESSAGE_QUEUE_WAIT_IN_ISR The caller is in an ISR, do not block! - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. */ Status_Control _CORE_message_queue_Submit( CORE_message_queue_Control *the_message_queue, @@ -298,7 +298,7 @@ Status_Control _CORE_message_queue_Submit( * * @retval STATUS_SUCCESSFUL The message was successfully seized from the message queue. * @retval STATUS_UNSATISFIED Wait was set to false and there is currently no pending message. - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. * * @note Returns message priority via return area in TCB. * @@ -351,7 +351,7 @@ void _CORE_message_queue_Insert_message( * @retval STATUS_MESSAGE_INVALID_SIZE The message size was too big. * @retval STATUS_TOO_MANY No message buffers were available. * @retval STATUS_MESSAGE_QUEUE_WAIT_IN_ISR The caller is in an ISR, do not block! - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. */ RTEMS_INLINE_ROUTINE Status_Control _CORE_message_queue_Send( CORE_message_queue_Control *the_message_queue, @@ -387,7 +387,7 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_message_queue_Send( * @retval STATUS_MESSAGE_INVALID_SIZE The message size was too big. * @retval STATUS_TOO_MANY No message buffers were available. * @retval STATUS_MESSAGE_QUEUE_WAIT_IN_ISR The caller is in an ISR, do not block! - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. */ RTEMS_INLINE_ROUTINE Status_Control _CORE_message_queue_Urgent( CORE_message_queue_Control *the_message_queue, diff --git a/cpukit/include/rtems/score/corerwlockimpl.h b/cpukit/include/rtems/score/corerwlockimpl.h index b182ebeeeb..dc1f375be6 100644 --- a/cpukit/include/rtems/score/corerwlockimpl.h +++ b/cpukit/include/rtems/score/corerwlockimpl.h @@ -169,7 +169,7 @@ RTEMS_INLINE_ROUTINE void _CORE_RWLock_Release( * @retval STATUS_SUCCESSFUL The RWlock was successfully seized. * @retval STATUS_UNAVAILABLE The RWlock is currently locked for writing * and the calling thread is not willing to wait. - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. */ Status_Control _CORE_RWLock_Seize_for_reading( diff --git a/cpukit/include/rtems/score/coresemimpl.h b/cpukit/include/rtems/score/coresemimpl.h index 00356b80bf..ba4825bce9 100644 --- a/cpukit/include/rtems/score/coresemimpl.h +++ b/cpukit/include/rtems/score/coresemimpl.h @@ -195,7 +195,7 @@ RTEMS_INLINE_ROUTINE uint32_t _CORE_semaphore_Get_count( * @retval STATUS_SUCCESSFUL The semaphore was successfully seized. * @retval STATUS_UNSATISFIED The semaphore is currently not free and the * calling thread not willing to wait. - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_TIMEOUT A timeout occurred. */ RTEMS_INLINE_ROUTINE Status_Control _CORE_semaphore_Seize( CORE_semaphore_Control *the_semaphore, diff --git a/cpukit/include/rtems/score/heapimpl.h b/cpukit/include/rtems/score/heapimpl.h index 76b9da8d5d..4403f186c7 100644 --- a/cpukit/include/rtems/score/heapimpl.h +++ b/cpukit/include/rtems/score/heapimpl.h @@ -185,7 +185,7 @@ bool _Heap_Free( Heap_Control *heap, void *addr ); * @param source If @a dump is @c true, this is used to mark the output lines. * @param dump Indicates whether diagnostic messages will be printed to standard output. * - * @retval true No errors occured, the heap´s integrity is not violated. + * @retval true No errors occurred, the heap´s integrity is not violated. * @retval false The heap is corrupt. */ bool _Heap_Walk( diff --git a/cpukit/include/rtems/score/mrspimpl.h b/cpukit/include/rtems/score/mrspimpl.h index 89711d6b1b..3e64ad94e6 100644 --- a/cpukit/include/rtems/score/mrspimpl.h +++ b/cpukit/include/rtems/score/mrspimpl.h @@ -345,8 +345,8 @@ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Initialize( * @retval STATUS_SUCCESSFUL The operation succeeded. * @retval STATUS_MUTEX_CEILING_VIOLATED The wait priority of the * currently executing thread exceeds the ceiling priority. - * @retval STATUS_DEADLOCK A deadlock occured. - * @retval STATUS_TIMEOUT A timeout occured. + * @retval STATUS_DEADLOCK A deadlock occurred. + * @retval STATUS_TIMEOUT A timeout occurred. */ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Wait_for_ownership( MRSP_Control *mrsp, diff --git a/cpukit/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h index 0c9c85e062..54db4577bc 100644 --- a/cpukit/include/rtems/score/objectimpl.h +++ b/cpukit/include/rtems/score/objectimpl.h @@ -326,7 +326,7 @@ Objects_Control *_Objects_Get_no_protection( * @param[in, out] next_id_p The Id of the next object we will look at. * * @retval pointer Pointer to the located object. - * @retval NULL An error occured. + * @retval NULL An error occurred. */ Objects_Control *_Objects_Get_next( Objects_Id id, @@ -346,7 +346,7 @@ Objects_Control *_Objects_Get_next( * * @retval pointer Pointer to the Object Information Table * for the class of objects which corresponds to this object ID. - * @retval NULL An error occured. + * @retval NULL An error occurred. */ Objects_Information *_Objects_Get_information( Objects_APIs the_api, @@ -363,7 +363,7 @@ Objects_Information *_Objects_Get_information( * * @retval pointer Pointer to the Object Information Table * for the class of objects which corresponds to this object ID. - * @retval NULL An error occured. + * @retval NULL An error occurred. */ Objects_Information *_Objects_Get_information_id( Objects_Id id @@ -396,7 +396,7 @@ RTEMS_INLINE_ROUTINE bool _Objects_Has_string_name( * @param[out] name A string which will be filled in. * * @retval @a name The operation was succeeded and the string was correctly filled in. - * @retval NULL An error occured. + * @retval NULL An error occurred. */ char *_Objects_Get_name_as_string( Objects_Id id, diff --git a/cpukit/include/rtems/score/profiling.h b/cpukit/include/rtems/score/profiling.h index 20e6a4a027..71bd797158 100644 --- a/cpukit/include/rtems/score/profiling.h +++ b/cpukit/include/rtems/score/profiling.h @@ -163,7 +163,7 @@ static inline void _Profiling_Update_max_interrupt_delay( * disable level is decremented. * * @param cpu The cpu control. - * @param interrupt_entry_instant The instant that the interrupt occured. + * @param interrupt_entry_instant The instant that the interrupt occurred. * @param interrupt_exit_instant The instant in which the interrupt was exited. */ void _Profiling_Outer_most_interrupt_entry_and_exit( diff --git a/cpukit/include/rtems/score/protectedheap.h b/cpukit/include/rtems/score/protectedheap.h index 8d42fb48b3..a8b9718ac3 100644 --- a/cpukit/include/rtems/score/protectedheap.h +++ b/cpukit/include/rtems/score/protectedheap.h @@ -220,7 +220,7 @@ bool _Protected_heap_Free( Heap_Control *heap, void *addr ); * @param source If @a dump is @c true, this is used to mark the output lines. * @param dump Indicates whether diagnostic messages will be printed to standard output. * - * @retval true No errors occured, the heap´s integrity is not violated. + * @retval true No errors occurred, the heap´s integrity is not violated. * @retval false The heap is corrupt. */ bool _Protected_heap_Walk( Heap_Control *heap, int source, bool dump ); diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c index 8aadf9c8ae..e65f72473e 100644 --- a/cpukit/libblock/src/bdbuf.c +++ b/cpukit/libblock/src/bdbuf.c @@ -331,7 +331,7 @@ rtems_bdbuf_avl_search (rtems_bdbuf_buffer** root, * @param root pointer to the root node of the AVL-Tree * @param node Pointer to the node to add. * @retval 0 The node added successfully - * @retval -1 An error occured + * @retval -1 An error occurred */ static int rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root, diff --git a/cpukit/libdrvmgr/drvmgr.c b/cpukit/libdrvmgr/drvmgr.c index 43148fd76a..4f48a9e2fc 100644 --- a/cpukit/libdrvmgr/drvmgr.c +++ b/cpukit/libdrvmgr/drvmgr.c @@ -266,7 +266,7 @@ static int do_dev_init( /* Note: This init function may register new devices */ dev->error = init(dev); if (dev->error != DRVMGR_OK) { - /* An error of some kind has occured in the + /* An error of some kind has occurred in the * driver/device, the failed device is put into the * inactive list, this way Init2,3 and/or 4 will not * be called for this device. diff --git a/cpukit/libdrvmgr/drvmgr_unregister.c b/cpukit/libdrvmgr/drvmgr_unregister.c index 47ad3b7866..fae5363651 100644 --- a/cpukit/libdrvmgr/drvmgr_unregister.c +++ b/cpukit/libdrvmgr/drvmgr_unregister.c @@ -25,7 +25,7 @@ int drvmgr_children_unregister(struct drvmgr_bus *bus) while (bus->children != NULL) { err = drvmgr_dev_unregister(bus->children); if (err != DRVMGR_OK) { - /* An error occured */ + /* An error occurred */ bus->children->error = err; return err; } diff --git a/cpukit/libfs/src/dosfs/fat.c b/cpukit/libfs/src/dosfs/fat.c index 32fdeb0042..9229406dec 100644 --- a/cpukit/libfs/src/dosfs/fat.c +++ b/cpukit/libfs/src/dosfs/fat.c @@ -164,7 +164,7 @@ fat_buf_release(fat_fs_info_t *fs_info) * buff - buffer provided by user * * RETURNS: - * bytes read on success, or -1 if error occured + * bytes read on success, or -1 if error occurred * and errno set appropriately */ ssize_t @@ -259,7 +259,7 @@ fat_block_write( * buff - buffer provided by user * * RETURNS: - * bytes written on success, or -1 if error occured + * bytes written on success, or -1 if error occurred * and errno set appropriately */ ssize_t @@ -388,7 +388,7 @@ fat_cluster_set( * fs_info - FS info * * RETURNS: - * 0 on success, or -1 if error occured and errno set appropriately + * 0 on success, or -1 if error occurred and errno set appropriately */ int _fat_block_release(fat_fs_info_t *fs_info) @@ -410,7 +410,7 @@ _fat_block_release(fat_fs_info_t *fs_info) * buff - buffer provided by user * * RETURNS: - * bytes written on success, or -1 if error occured + * bytes written on success, or -1 if error occurred * and errno set appropriately */ ssize_t @@ -472,7 +472,7 @@ static bool is_cluster_aligned(const fat_vol_t *vol, uint32_t sec_num) * fs_info - FS info * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * and errno set appropriately */ int @@ -785,7 +785,7 @@ fat_init_volume_info(fat_fs_info_t *fs_info, const char *device) * fs_info - FS info * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ static int fat_fat32_update_fsinfo_sector(fat_fs_info_t *fs_info) @@ -854,7 +854,7 @@ fat_sync(fat_fs_info_t *fs_info) * fs_info - FS info * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * and errno set appropriately */ int @@ -905,7 +905,7 @@ fat_shutdown_drive(fat_fs_info_t *fs_info) * start_cluster_num - num of first cluster in the chain * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * and errno set appropriately */ int diff --git a/cpukit/libfs/src/dosfs/fat_fat_operations.c b/cpukit/libfs/src/dosfs/fat_fat_operations.c index ab03c88fdc..24a408f9c7 100644 --- a/cpukit/libfs/src/dosfs/fat_fat_operations.c +++ b/cpukit/libfs/src/dosfs/fat_fat_operations.c @@ -37,7 +37,7 @@ * count - count of clusters to allocate (chain length) * * RETURNS: - * RC_OK on success, or error code if error occured (errno set + * RC_OK on success, or error code if error occurred (errno set * appropriately) * * @@ -170,7 +170,7 @@ cleanup: * chain - number of the first cluster in the chain * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ int fat_free_fat_clusters_chain( @@ -225,7 +225,7 @@ fat_free_fat_clusters_chain( * the chain) * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * and errno set appropriately */ int @@ -308,7 +308,7 @@ fat_get_fat_cluster( * in_val - value to set * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * and errno set appropriately */ int diff --git a/cpukit/libfs/src/dosfs/fat_file.c b/cpukit/libfs/src/dosfs/fat_file.c index ef9df0a67c..3384818801 100644 --- a/cpukit/libfs/src/dosfs/fat_file.c +++ b/cpukit/libfs/src/dosfs/fat_file.c @@ -82,7 +82,7 @@ fat_file_lseek( * * RETURNS: * RC_OK and pointer to opened descriptor on success, or -1 if error - * occured (errno set appropriately) + * occurred (errno set appropriately) */ int fat_file_open( @@ -208,7 +208,7 @@ fat_file_update(fat_fs_info_t *fs_info, fat_file_fd_t *fat_fd) * fat_fd - fat-file descriptor * * RETURNS: - * RC_OK, or -1 if error occured (errno set appropriately) + * RC_OK, or -1 if error occurred (errno set appropriately) */ int fat_file_close( @@ -280,7 +280,7 @@ fat_file_close( * buf - buffer provided by user * * RETURNS: - * the number of bytes read on success, or -1 if error occured (errno + * the number of bytes read on success, or -1 if error occurred (errno * set appropriately) */ ssize_t @@ -414,7 +414,7 @@ static bool * * RETURNS: * number of bytes actually written to the file on success, or -1 if - * error occured (errno set appropriately) + * error occurred (errno set appropriately) */ static ssize_t fat_file_write_fat32_or_non_root_dir( @@ -490,7 +490,7 @@ fat_file_write_fat32_or_non_root_dir( * * RETURNS: * number of bytes actually written to the file on success, or -1 if - * error occured (errno set appropriately) + * error occurred (errno set appropriately) */ ssize_t fat_file_write( @@ -578,7 +578,7 @@ fat_file_write( * a_length - placeholder for result - actual new length of file * * RETURNS: - * RC_OK and new length of file on success, or -1 if error occured (errno + * RC_OK and new length of file on success, or -1 if error occurred (errno * set appropriately) */ int @@ -648,7 +648,7 @@ fat_file_extend( rc = fat_scan_fat_for_free_clusters(fs_info, &chain, cls2add, &cls_added, &last_cl, zero_fill); - /* this means that low level I/O error occured */ + /* this means that low level I/O error occurred */ if (rc != RC_OK) return rc; @@ -730,7 +730,7 @@ fat_file_extend( * new_length - new length * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ int fat_file_truncate( @@ -795,7 +795,7 @@ fat_file_truncate( * ... * * RETURNS: - * RC_OK on success, or -1 if error occured and errno set appropriately + * RC_OK on success, or -1 if error occurred and errno set appropriately */ int fat_file_ioctl( @@ -894,7 +894,7 @@ fat_file_mark_removed( * fat_fd - fat-file descriptor * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ int fat_file_size( diff --git a/cpukit/libfs/src/dosfs/msdos_create.c b/cpukit/libfs/src/dosfs/msdos_create.c index 1304cc27cd..26df0451c9 100644 --- a/cpukit/libfs/src/dosfs/msdos_create.c +++ b/cpukit/libfs/src/dosfs/msdos_create.c @@ -55,7 +55,7 @@ * (see msdos_file.c, msdos_link for documentation) * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately). + * RC_OK on success, or -1 if error occurred (errno set appropriately). * */ int diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c index 8c8d43f130..093020cbfd 100644 --- a/cpukit/libfs/src/dosfs/msdos_dir.c +++ b/cpukit/libfs/src/dosfs/msdos_dir.c @@ -58,7 +58,7 @@ * count - count of bytes to read * * RETURNS: - * the number of bytes read on success, or -1 if error occured (errno + * the number of bytes read on success, or -1 if error occurred (errno * set apropriately). */ ssize_t @@ -381,7 +381,7 @@ msdos_dir_read(rtems_libio_t *iop, void *buffer, size_t count) * buf - stat buffer provided by user * * RETURNS: - * RC_OK and filled stat buffer on success, or -1 if error occured (errno + * RC_OK and filled stat buffer on success, or -1 if error occurred (errno * set apropriately). */ int diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c index e799105658..d142968337 100644 --- a/cpukit/libfs/src/dosfs/msdos_file.c +++ b/cpukit/libfs/src/dosfs/msdos_file.c @@ -41,7 +41,7 @@ * count - the number of bytes to read * * RETURNS: - * the number of bytes read on success, or -1 if error occured (errno set + * the number of bytes read on success, or -1 if error occurred (errno set * appropriately) */ ssize_t @@ -72,7 +72,7 @@ msdos_file_read(rtems_libio_t *iop, void *buffer, size_t count) * count - count of bytes to write * * RETURNS: - * the number of bytes written on success, or -1 if error occured + * the number of bytes written on success, or -1 if error occurred * and errno set appropriately */ ssize_t @@ -117,7 +117,7 @@ msdos_file_write(rtems_libio_t *iop,const void *buffer, size_t count) * buf - stat buffer provided by user * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ int msdos_file_stat( @@ -155,7 +155,7 @@ msdos_file_stat( * length - new length * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately). + * RC_OK on success, or -1 if error occurred (errno set appropriately). */ int msdos_file_ftruncate(rtems_libio_t *iop, off_t length) @@ -204,7 +204,7 @@ msdos_file_ftruncate(rtems_libio_t *iop, off_t length) * iop - file control block * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set appropriately) + * RC_OK on success, or -1 if error occurred (errno set appropriately) */ int msdos_file_sync(rtems_libio_t *iop) diff --git a/cpukit/libfs/src/dosfs/msdos_init.c b/cpukit/libfs/src/dosfs/msdos_init.c index a96b973cba..36f1442a26 100644 --- a/cpukit/libfs/src/dosfs/msdos_init.c +++ b/cpukit/libfs/src/dosfs/msdos_init.c @@ -91,7 +91,7 @@ void msdos_unlock(const rtems_filesystem_mount_table_entry_t *mt_entry) * temp_mt_entry - mount table entry * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set apropriately). + * RC_OK on success, or -1 if error occurred (errno set apropriately). * */ int rtems_dosfs_initialize( diff --git a/cpukit/libfs/src/dosfs/msdos_initsupp.c b/cpukit/libfs/src/dosfs/msdos_initsupp.c index e2ee85d4d4..6394f2ee58 100644 --- a/cpukit/libfs/src/dosfs/msdos_initsupp.c +++ b/cpukit/libfs/src/dosfs/msdos_initsupp.c @@ -44,7 +44,7 @@ * directory_handlers - directory operations table * * RETURNS: - * RC_OK and filled temp_mt_entry on success, or -1 if error occured + * RC_OK and filled temp_mt_entry on success, or -1 if error occurred * (errno set apropriately) * */ diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c index 5da48776c8..a82389bc42 100644 --- a/cpukit/libfs/src/dosfs/msdos_misc.c +++ b/cpukit/libfs/src/dosfs/msdos_misc.c @@ -334,7 +334,7 @@ msdos_long_to_short(rtems_dosfs_convert_control *converter, * * RETURNS: * RC_OK and updated 'parent_loc' on success, or -1 if error - * occured (errno set apropriately) + * occurred (errno set apropriately) * */ int @@ -476,7 +476,7 @@ msdos_find_name( * * RETURNS: * RC_OK, filled aux_struct_ptr and name_dir_entry on success, or -1 if - * error occured (errno set apropriately) + * error occurred (errno set apropriately) * */ int @@ -570,7 +570,7 @@ msdos_get_name_node( * dir_entry - placeholder for found node * * RETURNS: - * RC_OK, filled 'paux' and 'dir_entry' on success, or -1 if error occured + * RC_OK, filled 'paux' and 'dir_entry' on success, or -1 if error occurred * (errno set apropriately) * */ @@ -702,7 +702,7 @@ msdos_get_dotdot_dir_info_cluster_num_and_offset( * fat_fd - fat-file descriptor * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set apropriately). + * RC_OK on success, or -1 if error occurred (errno set apropriately). * */ int @@ -772,7 +772,7 @@ fat_file_write_time_and_date( * fat_fd - fat-file descriptor * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * */ int @@ -820,7 +820,7 @@ fat_file_write_first_cluster_num( * fat_fd - fat-file descriptor * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set apropriately). + * RC_OK on success, or -1 if error occurred (errno set apropriately). * */ int @@ -868,7 +868,7 @@ fat_file_write_file_size( * fchar - character to set up * * RETURNS: - * RC_OK on success, or -1 if error occured (errno set apropriately) + * RC_OK on success, or -1 if error occurred (errno set apropriately) * */ int @@ -939,7 +939,7 @@ msdos_set_first_char4file_name( * ret_val - placeholder for result * * RETURNS: - * RC_OK on success, or -1 if error occured + * RC_OK on success, or -1 if error occurred * */ int @@ -2001,7 +2001,7 @@ msdos_find_name_in_fat_file ( * dir_entry - placeholder for found node * * RETURNS: - * RC_OK on success, or error code if error occured + * RC_OK on success, or error code if error occurred * */ int msdos_find_node_by_cluster_num_in_fat_file( diff --git a/cpukit/score/cpu/mips/cpu_asm.S b/cpukit/score/cpu/mips/cpu_asm.S index 5692af22d7..327df4d2e9 100644 --- a/cpukit/score/cpu/mips/cpu_asm.S +++ b/cpukit/score/cpu/mips/cpu_asm.S @@ -750,7 +750,7 @@ _ISR_Handler_Exception: ** Note, if the exception vector returns, rely on it to have ** adjusted EPC so we will return to some correct address. If ** this is not done, we might get stuck in an infinite loop because - ** we'll return to the instruction where the exception occured and + ** we'll return to the instruction where the exception occurred and ** it could throw again. ** ** It is expected the only code using the exception processing is @@ -776,7 +776,7 @@ _ISR_Handler_Exception: beqz t4,excnodelay NOP - * it did, now see if the branch occured or not * + * it did, now see if the branch occurred or not * li t3,CAUSE_BT AND t4,t1,t3 beqz t4,excnobranch diff --git a/cpukit/score/cpu/nios2/nios2-iic-low-level.S b/cpukit/score/cpu/nios2/nios2-iic-low-level.S index a3d138883b..11c2c5e9eb 100644 --- a/cpukit/score/cpu/nios2/nios2-iic-low-level.S +++ b/cpukit/score/cpu/nios2/nios2-iic-low-level.S @@ -137,7 +137,7 @@ stuck_in_exception: /* * Restore the saved registers, so that all general purpose registers - * have been restored to their state at the time the interrupt occured. + * have been restored to their state at the time the interrupt occurred. */ ldw r1, 0(sp) @@ -277,7 +277,7 @@ _ISR_Handler: /* * Restore the saved registers, so that all general purpose registers - * have been restored to their state at the time the interrupt occured. + * have been restored to their state at the time the interrupt occurred. */ ldw r1, 0(sp) diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c index 663f7ac775..fc85f6f1bd 100644 --- a/cpukit/score/src/heapallocate.c +++ b/cpukit/score/src/heapallocate.c @@ -207,7 +207,7 @@ void *_Heap_Allocate_aligned_with_boundary( bool search_again = false; if ( block_size_floor < alloc_size ) { - /* Integer overflow occured */ + /* Integer overflow occurred */ return NULL; } -- cgit v1.2.3