From e6f013eac7204ff4a26e5fd3aa18f85a55708bdb Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Mon, 22 Feb 2016 17:01:43 +0100 Subject: [PATCH] fix spelling replace occured with occurred Fixes #3142 --- channels/drive/client/dirent.h | 2 +- channels/urbdrc/client/urbdrc_main.c | 2 +- .../com/freerdp/freerdpcore/presentation/BookmarkActivity.java | 2 +- client/common/cmdline.c | 2 +- libfreerdp/core/errconnect.c | 2 +- libfreerdp/core/tcp.c | 2 +- winpr/include/winpr/error.h | 1 + winpr/include/winpr/nt.h | 1 + winpr/libwinpr/comm/comm_serial_sys.c | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/channels/drive/client/dirent.h b/channels/drive/client/dirent.h index 9a293daa1..d9efa36a9 100644 --- a/channels/drive/client/dirent.h +++ b/channels/drive/client/dirent.h @@ -286,7 +286,7 @@ static struct dirent *readdir(DIR *dirp) return NULL; } if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) { - /* the very last entry has been processed or an error occured */ + /* the very last entry has been processed or an error occurred */ FindClose (dirp->search_handle); dirp->search_handle = INVALID_HANDLE_VALUE; return NULL; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index 78cd77da0..1e4c0a771 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -1026,7 +1026,7 @@ static void* urbdrc_search_usb_device(void* arg) } else { - WLog_ERR(TAG, "No Device from receive_device(). An error occured."); + WLog_ERR(TAG, "No Device from receive_device(). An error occurred."); } } } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java index 9c8140ecb..e78bb2a9b 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java @@ -575,7 +575,7 @@ public class BookmarkActivity extends PreferenceActivity implements if (!verifyFailed && sharedPreferences.getInt("bookmark.port", -1) <= 0) verifyFailed = true; - // if an error occured - display toast and return false + // if an error occurred - display toast and return false return (!verifyFailed); } diff --git a/client/common/cmdline.c b/client/common/cmdline.c index b1f64ee0a..510ef716e 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -1684,7 +1684,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, { id = (unsigned long int) freerdp_map_keyboard_layout_name_to_id(arg->Value); if (id == -1) - WLog_ERR(TAG, "A problem occured while mapping the layout name to id"); + WLog_ERR(TAG, "A problem occurred while mapping the layout name to id"); else if (id == 0) { WLog_ERR(TAG, "Could not identify keyboard layout: %s", arg->Value); diff --git a/libfreerdp/core/errconnect.c b/libfreerdp/core/errconnect.c index a52912b08..cd983b464 100644 --- a/libfreerdp/core/errconnect.c +++ b/libfreerdp/core/errconnect.c @@ -38,7 +38,7 @@ "A configuration error prevented a connection to be established." #define ERRCONNECT_CONNECT_UNDEFINED_STRING \ - "A undefined connection error occured." + "A undefined connection error occurred." #define ERRCONNECT_POST_CONNECT_FAILED_STRING \ "The connection attempt was aborted due to post connect configuration errors." diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 24bbcd05d..afd7015d0 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -489,7 +489,7 @@ static int transport_bio_buffered_write(BIO* bio, const char* buf, int num) */ if (buf && num && !ringbuffer_write(&ptr->xmitBuffer, (const BYTE*) buf, num)) { - WLog_ERR(TAG, "an error occured when writing (num: %d)", num); + WLog_ERR(TAG, "an error occurred when writing (num: %d)", num); return -1; } diff --git a/winpr/include/winpr/error.h b/winpr/include/winpr/error.h index e84b8f7bc..0a1511b0f 100644 --- a/winpr/include/winpr/error.h +++ b/winpr/include/winpr/error.h @@ -518,6 +518,7 @@ #define ERROR_DEVICE_ENUMERATION_ERROR 0x00000288 #define ERROR_MOUNT_POINT_NOT_RESOLVED 0x00000289 #define ERROR_INVALID_DEVICE_OBJECT_PARAMETER 0x0000028A +/* The following is not a typo. It's the same spelling as in the Microsoft headers */ #define ERROR_MCA_OCCURED 0x0000028B #define ERROR_DRIVER_DATABASE_ERROR 0x0000028C #define ERROR_SYSTEM_HIVE_TOO_LARGE 0x0000028D diff --git a/winpr/include/winpr/nt.h b/winpr/include/winpr/nt.h index d0761ebea..68bccc67d 100644 --- a/winpr/include/winpr/nt.h +++ b/winpr/include/winpr/nt.h @@ -977,6 +977,7 @@ #define STATUS_WAIT_FOR_OPLOCK ((NTSTATUS)0x00000367) #define STATUS_MOUNT_POINT_NOT_RESOLVED ((NTSTATUS)0xC0000368) #define STATUS_INVALID_DEVICE_OBJECT_PARAMETER ((NTSTATUS)0xC0000369) +/* The following is not a typo. It's the same spelling as in the Microsoft headers */ #define STATUS_MCA_OCCURED ((NTSTATUS)0xC000036A) #define STATUS_DRIVER_BLOCKED_CRITICAL ((NTSTATUS)0xC000036B) #define STATUS_DRIVER_BLOCKED ((NTSTATUS)0xC000036C) diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index 5c8b0277f..04e11da4b 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -1344,7 +1344,7 @@ static BOOL _get_commstatus(WINPR_COMM *pComm, SERIAL_STATUS *pCommstatus) } else { - /* FIXME: "is 80 percent full" from the specs is ambiguous, need to track when it previously occured? */ + /* FIXME: "is 80 percent full" from the specs is ambiguous, need to track when it previously * occurred? */ pComm->PendingEvents &= ~SERIAL_EV_RX80FULL; }