diff --git a/.github/ISSUE_TEMPLATE/backport.md b/.github/ISSUE_TEMPLATE/backport.md index 9c7c52919..a2cff52c6 100644 --- a/.github/ISSUE_TEMPLATE/backport.md +++ b/.github/ISSUE_TEMPLATE/backport.md @@ -4,4 +4,4 @@ about: Create a issue to request/track a backport --- -Releated pull request for master: +Related pull request for master: diff --git a/client/SDL/SDL2/dialogs/sdl_connection_dialog.cpp b/client/SDL/SDL2/dialogs/sdl_connection_dialog.cpp index bc8964e60..5b77e53a9 100644 --- a/client/SDL/SDL2/dialogs/sdl_connection_dialog.cpp +++ b/client/SDL/SDL2/dialogs/sdl_connection_dialog.cpp @@ -486,9 +486,9 @@ void SDLConnectionDialog::resetTimer() Uint32 SDLConnectionDialog::timeout(Uint32 intervalMS, void* pvthis) { - auto ths = static_cast(pvthis); - ths->hide(); - ths->_running = false; + auto self = static_cast(pvthis); + self->hide(); + self->_running = false; return 0; } diff --git a/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp b/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp index b7c486b89..f21cdb5aa 100644 --- a/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp +++ b/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp @@ -485,9 +485,9 @@ void SDLConnectionDialog::resetTimer() Uint32 SDLConnectionDialog::timeout(void* pvthis, SDL_TimerID timerID, Uint32 intervalMS) { - auto ths = static_cast(pvthis); - ths->hide(); - ths->_running = false; + auto self = static_cast(pvthis); + self->hide(); + self->_running = false; return 0; } diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 56ba36ba4..f15c6d383 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -2864,7 +2864,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ if (option_starts_with("remap:", val)) { - /* Append this new occurence to the already existing list */ + /* Append this new occurrence to the already existing list */ char* now = _strdup(&val[6]); const char* old = freerdp_settings_get_string(settings, FreeRDP_KeyboardRemappingList); diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 1d22c8163..609718ec7 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -93,7 +93,7 @@ static const SYSTEM_LOCALE SYSTEM_LOCALE_TABLE[] = { { "en", "AU", ENGLISH_AUSTRALIAN }, /* English (Australia) */ { "en", "BZ", ENGLISH_BELIZE }, /* English (Belize) */ { "en", "CA", ENGLISH_CANADIAN }, /* English (Canada) */ - { "en", "CB", ENGLISH_CARIBBEAN }, /* English (Carribbean) */ + { "en", "CB", ENGLISH_CARIBBEAN }, /* English (Caribbean) */ { "en", "IN", ENGLISH_INDIA }, /* Windows Vista and later: English (India) */ { "en", "IE", ENGLISH_IRELAND }, /* English (Ireland) */ { "en", "JM", ENGLISH_JAMAICA }, /* English (Jamaica) */ diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index bcbf06561..ff30a136d 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -781,7 +781,7 @@ static INLINE void shadow_client_common_frame_acknowledge(rdpShadowClient* clien * calculate how much frames are in progress. * Some rdp clients (win7 mstsc) skips frame ACK if it is * inactive, we should not expect ACK for each frame. - * So it is OK to calculate inflight frame count according to + * So it is OK to calculate in-flight frame count according to * a latest acknowledged frame id. */ WINPR_ASSERT(client); diff --git a/server/shadow/shadow_encoder.c b/server/shadow/shadow_encoder.c index 53739df21..222c95cf6 100644 --- a/server/shadow/shadow_encoder.c +++ b/server/shadow/shadow_encoder.c @@ -37,7 +37,7 @@ UINT32 shadow_encoder_preferred_fps(rdpShadowEncoder* encoder) UINT32 shadow_encoder_inflight_frames(rdpShadowEncoder* encoder) { - /* Return inflight frame count. + /* Return in-flight frame count. * If queueDepth is SUSPEND_FRAME_ACKNOWLEDGEMENT, count = 0 * Otherwise, calculate count = * - diff --git a/tools/wireshark/rdp-udp.lua b/tools/wireshark/rdp-udp.lua index ce80ece4b..5ed50cdcd 100644 --- a/tools/wireshark/rdp-udp.lua +++ b/tools/wireshark/rdp-udp.lua @@ -177,8 +177,8 @@ local field_rdpudp2_ackvec_base = Field.new("rdpudp2.ackvec.baseseqnum") function unwrapPacket(tvbuf) local len = tvbuf:reported_length_remaining() local ret = tvbuf:bytes(7, 1) .. tvbuf:bytes(1, 6) .. tvbuf:bytes(0, 1) .. tvbuf:bytes(8, len-8) - --dprint2("iput first bytes=", tvbuf:bytes(0, 9):tohex(true, " ")) - --dprint2("oput first bytes=", ret:subset(0, 9):tohex(true, " ")) + --dprint2("input first bytes=", tvbuf:bytes(0, 9):tohex(true, " ")) + --dprint2("output first bytes=", ret:subset(0, 9):tohex(true, " ")) return ret:tvb("RDP-UDP unwrapped") end diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c index a15810ade..a8dc1b0bd 100644 --- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c +++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c @@ -972,7 +972,7 @@ static BOOL test_ConvertFromUnicode_wrapper(void) } if (dst == NULL) { - (void)fprintf(stderr, "ConvertFromUnicode failure A2: destination ist NULL\n"); + (void)fprintf(stderr, "ConvertFromUnicode failure A2: destination is NULL\n"); goto fail; } if ((i = strlen(dst)) != 16) @@ -1005,7 +1005,7 @@ static BOOL test_ConvertFromUnicode_wrapper(void) } if (dst == NULL) { - (void)fprintf(stderr, "ConvertFromUnicode failure B2: destination ist NULL\n"); + (void)fprintf(stderr, "ConvertFromUnicode failure B2: destination is NULL\n"); goto fail; } if ((i = strlen(dst)) != 16) @@ -1088,7 +1088,7 @@ static BOOL test_ConvertToUnicode_wrapper(void) i = (size_t)ii; if (dst == NULL) { - (void)fprintf(stderr, "ConvertToUnicode failure A2: destination ist NULL\n"); + (void)fprintf(stderr, "ConvertToUnicode failure A2: destination is NULL\n"); goto fail; } if ((i = _wcslen(dst)) != 16) @@ -1123,7 +1123,7 @@ static BOOL test_ConvertToUnicode_wrapper(void) } if (dst == NULL) { - (void)fprintf(stderr, "ConvertToUnicode failure B2: destination ist NULL\n"); + (void)fprintf(stderr, "ConvertToUnicode failure B2: destination is NULL\n"); goto fail; } if ((i = _wcslen(dst)) != 16) diff --git a/winpr/libwinpr/utils/debug.c b/winpr/libwinpr/utils/debug.c index 1466634bd..4058d133c 100644 --- a/winpr/libwinpr/utils/debug.c +++ b/winpr/libwinpr/utils/debug.c @@ -125,7 +125,7 @@ void* winpr_backtrace(DWORD size) return winpr_win_backtrace(size); #else LOGF(support_msg); - /* return a non NULL buffer to allow the backtrace function familiy to succeed without failing + /* return a non NULL buffer to allow the backtrace function family to succeed without failing */ return _strdup(support_msg); #endif