From b315f1efe7627aced8a4f35a8557623e25cd0354 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 18:43:37 -0800 Subject: [PATCH 01/26] GUACAMOLE-1911: Fixed a typo mistake ("the the"). --- src/libguac/guacamole/rwlock.h | 2 +- src/libguac/guacamole/string.h | 2 +- src/protocols/kubernetes/pipe.h | 2 +- src/protocols/ssh/pipe.h | 2 +- src/protocols/telnet/pipe.h | 2 +- src/terminal/terminal/palette.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libguac/guacamole/rwlock.h b/src/libguac/guacamole/rwlock.h index 719a8e303..80de8caf3 100644 --- a/src/libguac/guacamole/rwlock.h +++ b/src/libguac/guacamole/rwlock.h @@ -118,7 +118,7 @@ int guac_rwlock_acquire_write_lock(guac_rwlock* reentrant_rwlock); int guac_rwlock_acquire_read_lock(guac_rwlock* reentrant_rwlock); /** - * Release the the rwlock associated with the provided guac reentrant rwlock if this + * Release the rwlock associated with the provided guac reentrant rwlock if this * is the last level of the lock held by this thread. Otherwise, the thread * local property associated with the key will be updated as needed to ensure * that the correct number of release requests will finally release the lock. diff --git a/src/libguac/guacamole/string.h b/src/libguac/guacamole/string.h index 27bf7b10c..a94d53c29 100644 --- a/src/libguac/guacamole/string.h +++ b/src/libguac/guacamole/string.h @@ -91,7 +91,7 @@ size_t guac_strlcpy(char* restrict dest, const char* restrict src, size_t n); * buffer will remain untouched (and unterminated) in this case. * * @param src - * The source string to append to the the destination buffer. This string + * The source string to append to the destination buffer. This string * MUST be null-terminated. * * @param n diff --git a/src/protocols/kubernetes/pipe.h b/src/protocols/kubernetes/pipe.h index 47565bfd8..8f60ee1bd 100644 --- a/src/protocols/kubernetes/pipe.h +++ b/src/protocols/kubernetes/pipe.h @@ -31,7 +31,7 @@ /** * Handles an incoming stream from a Guacamole "pipe" instruction. If the pipe - * is named "STDIN", the the contents of the pipe stream are redirected to + * is named "STDIN", the contents of the pipe stream are redirected to * STDIN of the terminal emulator for as long as the pipe is open. */ guac_user_pipe_handler guac_kubernetes_pipe_handler; diff --git a/src/protocols/ssh/pipe.h b/src/protocols/ssh/pipe.h index 8059f096f..044aa3b00 100644 --- a/src/protocols/ssh/pipe.h +++ b/src/protocols/ssh/pipe.h @@ -33,7 +33,7 @@ /** * Handles an incoming stream from a Guacamole "pipe" instruction. If the pipe - * is named "STDIN", the the contents of the pipe stream are redirected to + * is named "STDIN", the contents of the pipe stream are redirected to * STDIN of the terminal emulator for as long as the pipe is open. */ guac_user_pipe_handler guac_ssh_pipe_handler; diff --git a/src/protocols/telnet/pipe.h b/src/protocols/telnet/pipe.h index 51e9f9c8f..9cb252393 100644 --- a/src/protocols/telnet/pipe.h +++ b/src/protocols/telnet/pipe.h @@ -33,7 +33,7 @@ /** * Handles an incoming stream from a Guacamole "pipe" instruction. If the pipe - * is named "STDIN", the the contents of the pipe stream are redirected to + * is named "STDIN", the contents of the pipe stream are redirected to * STDIN of the terminal emulator for as long as the pipe is open. */ guac_user_pipe_handler guac_telnet_pipe_handler; diff --git a/src/terminal/terminal/palette.h b/src/terminal/terminal/palette.h index b7dc11180..a032692ee 100644 --- a/src/terminal/terminal/palette.h +++ b/src/terminal/terminal/palette.h @@ -30,14 +30,14 @@ #include /** - * The pseudo-index of the color set as the the default foreground color for + * The pseudo-index of the color set as the default foreground color for * the terminal. Regardless of what changes are made to the palette, this index * will always return the current default foreground color. */ #define GUAC_TERMINAL_COLOR_FOREGROUND -2 /** - * The pseudo-index of the color set as the the default background color for + * The pseudo-index of the color set as the default background color for * the terminal. Regardless of what changes are made to the palette, this index * will always return the current default background color. */ From 87b776b37b097790b1e4c461059d708d99d5251a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 18:54:16 -0800 Subject: [PATCH 02/26] GUACAMOLE-1911: Fixed some typo mistakes ("invokved", "initialied"). --- src/libguac/client.c | 4 ++-- src/protocols/rdp/plugins/guacai/guacai.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libguac/client.c b/src/libguac/client.c index a08f31218..910c9c501 100644 --- a/src/libguac/client.c +++ b/src/libguac/client.c @@ -1021,7 +1021,7 @@ int guac_client_owner_supports_required(guac_client* client) { } /** - * A callback function that is invokved by guac_client_owner_notify_join() to + * A callback function that is invoked by guac_client_owner_notify_join() to * notify the owner of a connection that another user has joined the * connection, returning zero if the message is sent successfully, or non-zero * if an error occurs. @@ -1080,7 +1080,7 @@ int guac_client_owner_notify_join(guac_client* client, guac_user* joiner) { } /** - * A callback function that is invokved by guac_client_owner_notify_leave() to + * A callback function that is invoked by guac_client_owner_notify_leave() to * notify the owner of a connection that another user has left the connection, * returning zero if the message is sent successfully, or non-zero * if an error occurs. diff --git a/src/protocols/rdp/plugins/guacai/guacai.c b/src/protocols/rdp/plugins/guacai/guacai.c index 36da54552..6ab633c05 100644 --- a/src/protocols/rdp/plugins/guacai/guacai.c +++ b/src/protocols/rdp/plugins/guacai/guacai.c @@ -220,7 +220,7 @@ static UINT guac_rdp_ai_new_connection( * needs to be initialized with other callbacks and data. * * @param plugin - * The AUDIO_INPUT plugin that needs to be initialied. + * The AUDIO_INPUT plugin that needs to be initialized. * * @param manager * The IWTSVirtualChannelManager instance with which the AUDIO_INPUT plugin From d1e690bd169dca597ea214e869a555803b4b768c Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 19:14:41 -0800 Subject: [PATCH 03/26] GUACAMOLE-1911: Fixed some typo mistakes ("writinging", "millseconds"). --- src/protocols/rdp/beep.c | 4 ++-- src/protocols/rdp/fs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/protocols/rdp/beep.c b/src/protocols/rdp/beep.c index 7f59dbbe7..06b786fdf 100644 --- a/src/protocols/rdp/beep.c +++ b/src/protocols/rdp/beep.c @@ -115,7 +115,7 @@ BOOL guac_rdp_beep_play_sound(rdpContext* context, /* Ignore if audio is not enabled */ if (!settings->audio_enabled) { guac_client_log(client, GUAC_LOG_DEBUG, "Ignoring request to beep " - "for %" PRIu32 " millseconds at %" PRIu32 " Hz as audio is " + "for %" PRIu32 " milliseconds at %" PRIu32 " Hz as audio is " "disabled.", play_sound->duration, play_sound->frequency); return TRUE; } @@ -128,7 +128,7 @@ BOOL guac_rdp_beep_play_sound(rdpContext* context, /* Stream availability is not guaranteed */ if (beep == NULL) { guac_client_log(client, GUAC_LOG_DEBUG, "Ignoring request to beep " - "for %" PRIu32 " millseconds at %" PRIu32 " Hz as no audio " + "for %" PRIu32 " milliseconds at %" PRIu32 " Hz as no audio " "stream could be allocated.", play_sound->duration, play_sound->frequency); return TRUE; diff --git a/src/protocols/rdp/fs.h b/src/protocols/rdp/fs.h index 298ef41be..48ca2f96a 100644 --- a/src/protocols/rdp/fs.h +++ b/src/protocols/rdp/fs.h @@ -449,7 +449,7 @@ int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, uint64_t offset, * The ID of the file to write data to, as returned by guac_rdp_fs_open(). * * @param offset - * The byte offset within the file to start writinging at. + * The byte offset within the file to start writing at. * * @param buffer * The buffer containing the data to write. From 5a328872cd6fe940bd30f1160e74791b7dee79d0 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 20:59:30 -0800 Subject: [PATCH 04/26] GUACAMOLE-1911: Fixed a typo mistake ("compresion"). --- src/protocols/rdp/settings.c | 2 +- src/protocols/vnc/settings.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c index b259fc9df..ee659a83d 100644 --- a/src/protocols/rdp/settings.c +++ b/src/protocols/rdp/settings.c @@ -656,7 +656,7 @@ enum RDP_ARGS_IDX { /** * "true" if all graphical updates for this connection should use lossless - * compresion only, "false" or blank otherwise. + * compression only, "false" or blank otherwise. */ IDX_FORCE_LOSSLESS, diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c index a7171128e..725e10cb7 100644 --- a/src/protocols/vnc/settings.c +++ b/src/protocols/vnc/settings.c @@ -378,7 +378,7 @@ enum VNC_ARGS_IDX { /** * "true" if all graphical updates for this connection should use lossless - * compresion only, "false" or blank otherwise. + * compression only, "false" or blank otherwise. */ IDX_FORCE_LOSSLESS, From b4e8ac3a66fb9cb1ce7012ccb02e38cc7ab56442 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:24:54 -0800 Subject: [PATCH 05/26] GUACAMOLE-1911: Fixed some typo mistakes ("sould", "contrained"). --- src/protocols/rdp/channels/audio-input/audio-buffer.h | 2 +- src/protocols/rdp/channels/disp.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/protocols/rdp/channels/audio-input/audio-buffer.h b/src/protocols/rdp/channels/audio-input/audio-buffer.h index 127198076..f7bfcd87c 100644 --- a/src/protocols/rdp/channels/audio-input/audio-buffer.h +++ b/src/protocols/rdp/channels/audio-input/audio-buffer.h @@ -169,7 +169,7 @@ struct guac_rdp_audio_buffer { pthread_t flush_thread; /** - * The absolute point in time that the next packet of audio data sould be + * The absolute point in time that the next packet of audio data should be * flushed. Another packet of received data should not be flushed prior to * this time. */ diff --git a/src/protocols/rdp/channels/disp.h b/src/protocols/rdp/channels/disp.h index b53536a6e..54fe4ccfa 100644 --- a/src/protocols/rdp/channels/disp.h +++ b/src/protocols/rdp/channels/disp.h @@ -147,12 +147,12 @@ void guac_rdp_disp_load_plugin(rdpContext* context); * * @param width * The desired display width, in pixels. Due to the restrictions of the RDP - * display update channel, this will be contrained to the range of 200 + * display update channel, this will be constrained to the range of 200 * through 8192 inclusive, and rounded down to the nearest even number. * * @param height * The desired display height, in pixels. Due to the restrictions of the - * RDP display update channel, this will be contrained to the range of 200 + * RDP display update channel, this will be constrained to the range of 200 * through 8192 inclusive. */ void guac_rdp_disp_set_size(guac_rdp_disp* disp, guac_rdp_settings* settings, From dd65517857637e02ab032e3896f1031446f8135b Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:29:21 -0800 Subject: [PATCH 06/26] GUACAMOLE-1911: Fixed some typo mistakes ("accross", "specfying"). --- src/protocols/rdp/channels/pipe-svc.h | 2 +- src/protocols/rdp/doc/svc-example/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/rdp/channels/pipe-svc.h b/src/protocols/rdp/channels/pipe-svc.h index f4575d4ec..e685e8c1f 100644 --- a/src/protocols/rdp/channels/pipe-svc.h +++ b/src/protocols/rdp/channels/pipe-svc.h @@ -103,7 +103,7 @@ void guac_rdp_pipe_svc_send_pipe(guac_socket* socket, guac_rdp_pipe_svc* svc); * The client associated with the users being sent the pipe instruction. * * @param socket - * The socket to send the pipe instruction accross. + * The socket to send the pipe instruction across. */ void guac_rdp_pipe_svc_send_pipes( guac_client* client, guac_socket* socket); diff --git a/src/protocols/rdp/doc/svc-example/README.md b/src/protocols/rdp/doc/svc-example/README.md index 337a733e9..3524fdc76 100644 --- a/src/protocols/rdp/doc/svc-example/README.md +++ b/src/protocols/rdp/doc/svc-example/README.md @@ -7,7 +7,7 @@ RDP sessions. This example is intended to demonstrate how bidirectional communication between the Guacamole client and applications within the RDP server can be accomplished. -Arbitrary SVCs are enabled on RDP connections by specfying their names as the +Arbitrary SVCs are enabled on RDP connections by specifying their names as the value of [the `static-channels` parameter](http://guacamole.apache.org/doc/gug/configuring-guacamole.html#rdp-device-redirection). Each name is limited to a maximum of 7 characters. Multiple names may be listed From 12066af4317f0a263a5769a3d3e8985af1963611 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:37:20 -0800 Subject: [PATCH 07/26] GUACAMOLE-1911: Fixed some typo mistakes ("mousr", "grapic"). --- src/common/common/cursor.h | 2 +- src/common/common/dot_cursor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/common/cursor.h b/src/common/common/cursor.h index aca24faaf..404fe5627 100644 --- a/src/common/common/cursor.h +++ b/src/common/common/cursor.h @@ -118,7 +118,7 @@ typedef struct guac_common_cursor { int button_mask; /** - * The server timestamp representing the point in time when the mousr + * The server timestamp representing the point in time when the mouse * location was last updated. */ guac_timestamp timestamp; diff --git a/src/common/common/dot_cursor.h b/src/common/common/dot_cursor.h index 034d04452..9d12ecc9f 100644 --- a/src/common/common/dot_cursor.h +++ b/src/common/common/dot_cursor.h @@ -42,7 +42,7 @@ extern const int guac_common_dot_cursor_height; extern const int guac_common_dot_cursor_stride; /** - * The Cairo grapic format of the mouse cursor graphic. + * The Cairo graphic format of the mouse cursor graphic. */ extern const cairo_format_t guac_common_dot_cursor_format; From 645a288f3cd0f83f9a181b7a32d3d5d7188783d0 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:42:17 -0800 Subject: [PATCH 08/26] GUACAMOLE-1911: Fixed some typo mistakes ("whos", "Sunchronize"). --- src/common/common/surface.h | 2 +- src/common/display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/common/surface.h b/src/common/common/surface.h index 09e5b0d5b..21859a3e1 100644 --- a/src/common/common/surface.h +++ b/src/common/common/surface.h @@ -491,7 +491,7 @@ void guac_common_surface_flush(guac_common_surface* surface); * The surface to duplicate. * * @param client - * The client whos users are receiving the surface. + * The client whose users are receiving the surface. * * @param socket * The socket over which the surface contents should be sent. diff --git a/src/common/display.c b/src/common/display.c index 9e8844302..00b3cdbdf 100644 --- a/src/common/display.c +++ b/src/common/display.c @@ -170,7 +170,7 @@ void guac_common_display_dup( pthread_mutex_lock(&display->_lock); - /* Sunchronize shared cursor */ + /* Synchronize shared cursor */ guac_common_cursor_dup(display->cursor, client, socket); /* Synchronize default surface */ From 6ab8d03c88171a663030ff4a5318d445e1a73342 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:46:56 -0800 Subject: [PATCH 09/26] GUACAMOLE-1911: Fixed some typo mistakes ("charaters", "indiciates"). --- src/common-ssh/common-ssh/key.h | 2 +- src/common/iconv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common-ssh/common-ssh/key.h b/src/common-ssh/common-ssh/key.h index 5d829b9a1..4ed9bacd9 100644 --- a/src/common-ssh/common-ssh/key.h +++ b/src/common-ssh/common-ssh/key.h @@ -107,7 +107,7 @@ void guac_common_ssh_key_free(guac_common_ssh_key* key); * single host_key, provided by the client, or a set of known_hosts entries * provided in the /etc/guacamole/ssh_known_hosts file. Failure to correctly * load the known_hosts entries will result in a connection abort and a returned - * error code. A return code of zero indiciates that either no known_hosts entries + * error code. A return code of zero indicates that either no known_hosts entries * were provided, or that the verification succeeded (match). Negative values * indicate internal libssh2 error codes; positive values indicate a failure * during verification of the host key against the known hosts. diff --git a/src/common/iconv.c b/src/common/iconv.c index 3bd9f5d73..c7da7e8b5 100644 --- a/src/common/iconv.c +++ b/src/common/iconv.c @@ -140,7 +140,7 @@ int GUAC_READ_ISO8859_1(const char** input, int remaining) { /** * Invokes the given reader function, automatically normalizing newline - * sequences as Unix-style newline characters ('\n'). All other charaters are + * sequences as Unix-style newline characters ('\n'). All other characters are * read verbatim. * * @param reader @@ -256,7 +256,7 @@ void GUAC_WRITE_ISO8859_1(char** output, int remaining, int value) { /** * Invokes the given writer function, automatically writing newline characters - * ('\n') as CRLF ("\r\n"). All other charaters are written verbatim. + * ('\n') as CRLF ("\r\n"). All other characters are written verbatim. * * @param writer * The writer to use to write the given character. From 4ff54ad30636eb289828ddeefa9a3cc2c7ee77b7 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 21:59:52 -0800 Subject: [PATCH 10/26] GUACAMOLE-1911: Fixed some typo mistakes ("fullfill", "fullfilling", "cerficiate"). --- src/common-ssh/ssh.c | 2 +- src/guacd/man/guacd.8.in | 2 +- src/guacd/man/guacd.conf.5.in | 2 +- src/protocols/rdp/channels/cliprdr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common-ssh/ssh.c b/src/common-ssh/ssh.c index c4c3b4cc3..373e00156 100644 --- a/src/common-ssh/ssh.c +++ b/src/common-ssh/ssh.c @@ -203,7 +203,7 @@ void guac_common_ssh_uninit() { /** * Callback for the keyboard-interactive authentication method. Currently * supports just one prompt for the password. This callback is invoked as - * needed to fullfill a call to libssh2_userauth_keyboard_interactive(). + * needed to fulfill a call to libssh2_userauth_keyboard_interactive(). * * @param name * An arbitrary name which should be printed to the terminal for the diff --git a/src/guacd/man/guacd.8.in b/src/guacd/man/guacd.8.in index 65fc9d59f..d32e8ebde 100644 --- a/src/guacd/man/guacd.8.in +++ b/src/guacd/man/guacd.8.in @@ -104,7 +104,7 @@ command. Beware that the certificate for be the first certificate in the file. .TP \fB-C\fR \fICERTIFICATE FILE\fR -Enables SSL/TLS using the given cerficiate file. Future connections to +Enables SSL/TLS using the given certificate file. Future connections to this instance of .B guacd will require SSL/TLS enabled in the client (the web application). If diff --git a/src/guacd/man/guacd.conf.5.in b/src/guacd/man/guacd.conf.5.in index 524bd5c09..554bf649e 100644 --- a/src/guacd/man/guacd.conf.5.in +++ b/src/guacd/man/guacd.conf.5.in @@ -145,7 +145,7 @@ command. Beware that the certificate for be the first certificate in the file. .TP \fBserver_certificate\fR \fB=\fR \fICERTIFICATE FILE\fR -Enables SSL/TLS using the given cerficiate file. Future connections to +Enables SSL/TLS using the given certificate file. Future connections to .B guacd will require SSL/TLS enabled in the client (the web application). .TP diff --git a/src/protocols/rdp/channels/cliprdr.c b/src/protocols/rdp/channels/cliprdr.c index 97e3ed532..3f39470e0 100644 --- a/src/protocols/rdp/channels/cliprdr.c +++ b/src/protocols/rdp/channels/cliprdr.c @@ -412,7 +412,7 @@ static UINT guac_rdp_cliprdr_format_data_request(CliprdrClientContext* cliprdr, /** * Callback invoked by the FreeRDP CLIPRDR plugin for received Format Data * Response PDUs. The Format Data Response PDU is sent by the RDP server when - * fullfilling a request for clipboard data received via a Format Data Request + * fulfilling a request for clipboard data received via a Format Data Request * PDU. * * @param cliprdr From d381d59c2e9704d8cba53f3ceff075e5dcd8b4fd Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 22:04:04 -0800 Subject: [PATCH 11/26] GUACAMOLE-1911: Fixed some typo mistakes ("desriptor", "proccess"). --- src/guacd/daemon.c | 4 ++-- src/libguac/socket-fd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c index 33184e369..ac848f10b 100644 --- a/src/guacd/daemon.c +++ b/src/guacd/daemon.c @@ -85,7 +85,7 @@ static int redirect_fd(int fd, int flags) { /** * Turns the current process into a daemon through a series of fork() calls. - * The standard I/O file desriptors for STDIN, STDOUT, and STDERR will be + * The standard I/O file descriptors for STDIN, STDOUT, and STDERR will be * redirected to /dev/null, and the working directory is changed to root. * Execution within the caller of this function will terminate before this * function returns, while execution within the daemonized child process will @@ -560,7 +560,7 @@ int main(int argc, char* argv[]) { /* * FIXME: Clean up the proc map. This is not as straightforward as it * might seem, since the detached connection threads will attempt to - * remove the connection proccesses from the map when they complete, + * remove the connection processes from the map when they complete, * which will also happen upon shutdown. So there's a good chance that * this map cleanup will happen at the same time as the thread cleanup. * The map _does_ have locking mechanisms in place for ensuring thread diff --git a/src/libguac/socket-fd.c b/src/libguac/socket-fd.c index 44f45e2ec..5c1b463fb 100644 --- a/src/libguac/socket-fd.c +++ b/src/libguac/socket-fd.c @@ -325,7 +325,7 @@ static ssize_t guac_socket_fd_write_handler(guac_socket* socket, } /** - * Waits for data on the underlying file desriptor of the given socket to + * Waits for data on the underlying file descriptor of the given socket to * become available such that the next read operation will not block. * * @param socket From 45ecdaf73741ae7f6e61cd9c76d1ea6b6e61f1a7 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 22:17:24 -0800 Subject: [PATCH 12/26] GUACAMOLE-1911: Fixed some typo mistakes ("alotted", "conncetion", "hostspot"). --- src/guacd/proc.c | 4 ++-- src/guacd/proc.h | 2 +- src/guacenc/cursor.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/guacd/proc.c b/src/guacd/proc.c index 28ccac1c1..986d3596a 100644 --- a/src/guacd/proc.c +++ b/src/guacd/proc.c @@ -232,7 +232,7 @@ static void* guacd_client_free_thread(void* data) { /** * Attempts to free the given guac_client, restricting the time taken by the * free handler of the guac_client to a finite number of seconds. If the free - * handler does not complete within the time alotted, this function returns + * handler does not complete within the time allotted, this function returns * and the intended free operation is left in an undefined state. * * @param client @@ -243,7 +243,7 @@ static void* guacd_client_free_thread(void* data) { * in seconds. * * @return - * Zero if the guac_client was successfully freed within the time alotted, + * Zero if the guac_client was successfully freed within the time allotted, * non-zero otherwise. */ static int guacd_timed_client_free(guac_client* client, int timeout) { diff --git a/src/guacd/proc.h b/src/guacd/proc.h index d13ae1021..f6def1ed0 100644 --- a/src/guacd/proc.h +++ b/src/guacd/proc.h @@ -35,7 +35,7 @@ /** * The number of microseconds to wait for messages in any phase before - * timing out and closing the conncetion with an error. This is always + * timing out and closing the connection with an error. This is always * equal to GUACD_TIMEOUT * 1000. */ #define GUACD_USEC_TIMEOUT (GUACD_TIMEOUT*1000) diff --git a/src/guacenc/cursor.h b/src/guacenc/cursor.h index 89c8fca08..80f4729a4 100644 --- a/src/guacenc/cursor.h +++ b/src/guacenc/cursor.h @@ -27,7 +27,7 @@ #include /** - * A mouse cursor, having a current location, hostspot, and associated cursor + * A mouse cursor, having a current location, hotspot, and associated cursor * image. */ typedef struct guacenc_cursor { From 90f32d41e13680b7751eb9998d485df6b870a8ab Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 21 Jan 2024 22:22:25 -0800 Subject: [PATCH 13/26] GUACAMOLE-1911: Fixed some typo mistakes ("comparitor", "specied"). --- src/guacenc/display-flatten.c | 2 +- src/guacenc/ffmpeg-compat.h | 2 +- src/guacenc/video.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guacenc/display-flatten.c b/src/guacenc/display-flatten.c index 4a86c0d5e..2a9261a36 100644 --- a/src/guacenc/display-flatten.c +++ b/src/guacenc/display-flatten.c @@ -32,7 +32,7 @@ /** * The Guacamole video encoder display related to the current qsort() * operation. As qsort() does not provide a means of passing arbitrary data to - * the comparitor, this value must be set prior to invoking qsort() with + * the comparator, this value must be set prior to invoking qsort() with * guacenc_display_layer_comparator. */ guacenc_display* __qsort_display; diff --git a/src/guacenc/ffmpeg-compat.h b/src/guacenc/ffmpeg-compat.h index a5cfb2f59..97d771ebb 100644 --- a/src/guacenc/ffmpeg-compat.h +++ b/src/guacenc/ffmpeg-compat.h @@ -69,7 +69,7 @@ #endif /** - * Writes the specied frame as a new frame of video. If pending frames of the + * Writes the specified frame as a new frame of video. If pending frames of the * video are being flushed, the given frame may be NULL (as required by * avcodec_encode_video2()). If avcodec_encode_video2() does not exist, this * function will transparently use avcodec_encode_video(). diff --git a/src/guacenc/video.c b/src/guacenc/video.c index 1f58158e3..dd125302f 100644 --- a/src/guacenc/video.c +++ b/src/guacenc/video.c @@ -191,7 +191,7 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name, } /** - * Flushes the specied frame as a new frame of video, updating the internal + * Flushes the specified frame as a new frame of video, updating the internal * video timestamp by one frame's worth of time. The pts member of the given * frame structure will be updated with the current presentation timestamp of * the video. If pending frames of the video are being flushed, the given frame From 61689541736b0a3a00b5718ecaeb4667f09ecf28 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 00:39:18 -0800 Subject: [PATCH 14/26] GUACAMOLE-1911: Fixed some typo mistakes ("successfuly", "occured", "reasource"). --- src/libguac/guacamole/client-fntypes.h | 4 ++-- src/libguac/guacamole/client.h | 2 +- src/libguac/guacamole/rwlock.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libguac/guacamole/client-fntypes.h b/src/libguac/guacamole/client-fntypes.h index 367a6f1e2..4a747db5a 100644 --- a/src/libguac/guacamole/client-fntypes.h +++ b/src/libguac/guacamole/client-fntypes.h @@ -59,8 +59,8 @@ typedef int guac_client_free_handler(guac_client* client); * The client whose handler was invoked. * * @return - * Zero if the pending handler ran successfuly, or a non-zero value if an - * error occured. + * Zero if the pending handler ran successfully, or a non-zero value if an + * error occurred. */ typedef int guac_client_join_pending_handler(guac_client* client); diff --git a/src/libguac/guacamole/client.h b/src/libguac/guacamole/client.h index fbb89a727..ccc9039cd 100644 --- a/src/libguac/guacamole/client.h +++ b/src/libguac/guacamole/client.h @@ -327,7 +327,7 @@ guac_client* guac_client_alloc(); /** * Free all resources associated with the given client. * - * @param client The proxy client to free all reasources of. + * @param client The proxy client to free all resources of. */ void guac_client_free(guac_client* client); diff --git a/src/libguac/guacamole/rwlock.h b/src/libguac/guacamole/rwlock.h index 80de8caf3..d7c1973a9 100644 --- a/src/libguac/guacamole/rwlock.h +++ b/src/libguac/guacamole/rwlock.h @@ -94,7 +94,7 @@ void guac_rwlock_destroy(guac_rwlock* lock); * * @return * Zero if the lock is succesfully acquired, or a non-zero value if an - * error occured. + * error occurred. */ int guac_rwlock_acquire_write_lock(guac_rwlock* reentrant_rwlock); @@ -113,7 +113,7 @@ int guac_rwlock_acquire_write_lock(guac_rwlock* reentrant_rwlock); * * @return * Zero if the lock is succesfully acquired, or a non-zero value if an - * error occured. + * error occurred. */ int guac_rwlock_acquire_read_lock(guac_rwlock* reentrant_rwlock); @@ -131,7 +131,7 @@ int guac_rwlock_acquire_read_lock(guac_rwlock* reentrant_rwlock); * * @return * Zero if the lock is succesfully released, or a non-zero value if an - * error occured. + * error occurred. */ int guac_rwlock_release_lock(guac_rwlock* reentrant_rwlock); From 2e8a2884a59fc8d803ffc86e088ceb80e4252d4a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 00:44:15 -0800 Subject: [PATCH 15/26] GUACAMOLE-1911: Fixed some typo mistakes ("interal", "stram"). --- src/libguac/guacamole/parser.h | 2 +- src/libguac/guacamole/protocol.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/guacamole/parser.h b/src/libguac/guacamole/parser.h index 1d948089a..5324eb499 100644 --- a/src/libguac/guacamole/parser.h +++ b/src/libguac/guacamole/parser.h @@ -143,7 +143,7 @@ void guac_parser_free(guac_parser* parser); * Reads a single instruction from the given guac_socket connection. This * may result in additional data being read from the guac_socket, stored * internally within a buffer for future parsing. Future calls to - * guac_parser_read() will read from the interal buffer before reading + * guac_parser_read() will read from the internal buffer before reading * from the guac_socket. Data from the internal buffer can be removed * and used elsewhere through guac_parser_shift(). * diff --git a/src/libguac/guacamole/protocol.h b/src/libguac/guacamole/protocol.h index 91debdde4..9a6ca665e 100644 --- a/src/libguac/guacamole/protocol.h +++ b/src/libguac/guacamole/protocol.h @@ -291,7 +291,7 @@ int guac_protocol_send_touch(guac_socket* socket, int id, int x, int y, * socket directly. * * @param socket The guac_socket connection to use. - * @param index The integer index of the stram to send the protocol + * @param index The integer index of the stream to send the protocol * data over. * @param data A string containing protocol data, which must be UTF-8 * encoded and null-terminated. From 263fac5af5cb72c9a20e9050b30c3817d8fbcef8 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 00:45:00 -0800 Subject: [PATCH 16/26] GUACAMOLE-1911: Fixed some typo mistakes ("interal", "stram", "behavies"). --- src/libguac/guacamole/protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libguac/guacamole/protocol.h b/src/libguac/guacamole/protocol.h index 9a6ca665e..7be0ef2a9 100644 --- a/src/libguac/guacamole/protocol.h +++ b/src/libguac/guacamole/protocol.h @@ -341,7 +341,7 @@ int guac_protocol_send_set(guac_socket* socket, const guac_layer* layer, /** * Sends a set instruction over the given guac_socket connection. This function - * behavies identically to guac_protocol_send_set() except that the provided + * behaves identically to guac_protocol_send_set() except that the provided * parameter value is an integer, rather than a string. * * If an error occurs sending the instruction, a non-zero value is From 33416d87cdf970684c269cda88388fdbfe168a10 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 00:48:42 -0800 Subject: [PATCH 17/26] GUACAMOLE-1911: Fixed some typo mistakes ("aquire", "succesfully"). --- src/libguac/guacamole/rwlock.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libguac/guacamole/rwlock.h b/src/libguac/guacamole/rwlock.h index d7c1973a9..88d0029e1 100644 --- a/src/libguac/guacamole/rwlock.h +++ b/src/libguac/guacamole/rwlock.h @@ -29,7 +29,7 @@ * * A thread will attempt to acquire the requested lock on the first acquire * function call, and will release it once the number of unlock requests - * matches the number of lock requests. Therefore, it is safe to aquire a lock + * matches the number of lock requests. Therefore, it is safe to acquire a lock * and then call a function that also acquires the same lock, provided that * the caller and the callee request to unlock the lock when done with it. * @@ -79,7 +79,7 @@ void guac_rwlock_init(guac_rwlock* lock); void guac_rwlock_destroy(guac_rwlock* lock); /** - * Aquire the write lock for the provided guac reentrant rwlock, if the key does not + * Acquire the write lock for the provided guac reentrant rwlock, if the key does not * indicate that the write lock is already acquired. If the key indicates that * the read lock is already acquired, the read lock will be dropped before the * write lock is acquired. The thread local property associated with the key @@ -93,13 +93,13 @@ void guac_rwlock_destroy(guac_rwlock* lock); * reentrantly. * * @return - * Zero if the lock is succesfully acquired, or a non-zero value if an + * Zero if the lock is successfully acquired, or a non-zero value if an * error occurred. */ int guac_rwlock_acquire_write_lock(guac_rwlock* reentrant_rwlock); /** - * Aquire the read lock for the provided guac reentrant rwlock, if the key does not + * Acquire the read lock for the provided guac reentrant rwlock, if the key does not * indicate that the read or write lock is already acquired. The thread local * property associated with the key will be updated as necessary to track the * thread's ownership of the lock. @@ -112,7 +112,7 @@ int guac_rwlock_acquire_write_lock(guac_rwlock* reentrant_rwlock); * reentrantly. * * @return - * Zero if the lock is succesfully acquired, or a non-zero value if an + * Zero if the lock is successfully acquired, or a non-zero value if an * error occurred. */ int guac_rwlock_acquire_read_lock(guac_rwlock* reentrant_rwlock); @@ -130,7 +130,7 @@ int guac_rwlock_acquire_read_lock(guac_rwlock* reentrant_rwlock); * The guac reentrant rwlock that should be released. * * @return - * Zero if the lock is succesfully released, or a non-zero value if an + * Zero if the lock is successfully released, or a non-zero value if an * error occurred. */ int guac_rwlock_release_lock(guac_rwlock* reentrant_rwlock); From 2f6d43b058ffe2867173f25213ba992400141ee5 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 00:52:13 -0800 Subject: [PATCH 18/26] GUACAMOLE-1911: Fixed some typo mistakes ("functionss", "sucessfully"). --- src/libguac/guacamole/socket.h | 2 +- src/libguac/guacamole/user-fntypes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/guacamole/socket.h b/src/libguac/guacamole/socket.h index bb5711c04..af57e8745 100644 --- a/src/libguac/guacamole/socket.h +++ b/src/libguac/guacamole/socket.h @@ -21,7 +21,7 @@ #define _GUAC_SOCKET_H /** - * Defines the guac_socket object and functionss for using and manipulating it. + * Defines the guac_socket object and functions for using and manipulating it. * * @file socket.h */ diff --git a/src/libguac/guacamole/user-fntypes.h b/src/libguac/guacamole/user-fntypes.h index 95f099e9a..646a3b007 100644 --- a/src/libguac/guacamole/user-fntypes.h +++ b/src/libguac/guacamole/user-fntypes.h @@ -375,7 +375,7 @@ typedef int guac_user_ack_handler(guac_user* user, guac_stream* stream, * The stream that is being closed. * * @return - * Zero if the end-of-stream condition has been sucessfully handled, + * Zero if the end-of-stream condition has been successfully handled, * non-zero otherwise. */ typedef int guac_user_end_handler(guac_user* user, guac_stream* stream); From a700b7dfbd61d26ad6cceb41993e0188ee1d5dd6 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 01:08:10 -0800 Subject: [PATCH 19/26] GUACAMOLE-1911: Fixed some typo mistakes ("extention", "correc"). --- src/libguac/encode-jpeg.c | 2 +- src/libguac/tests/id/generate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/encode-jpeg.c b/src/libguac/encode-jpeg.c index 65d8ceaeb..45f232553 100644 --- a/src/libguac/encode-jpeg.c +++ b/src/libguac/encode-jpeg.c @@ -200,7 +200,7 @@ int guac_jpeg_write(guac_socket* socket, guac_stream* stream, cinfo.arith_code = TRUE; #ifdef JCS_EXTENSIONS - /* The Turbo JPEG extentions allows us to use the Cairo surface + /* The Turbo JPEG extensions allows us to use the Cairo surface * (BGRx) as input without converting it */ cinfo.input_components = 4; cinfo.in_color_space = JCS_EXT_BGRX; diff --git a/src/libguac/tests/id/generate.c b/src/libguac/tests/id/generate.c index 31c336a72..4f369fdf1 100644 --- a/src/libguac/tests/id/generate.c +++ b/src/libguac/tests/id/generate.c @@ -48,7 +48,7 @@ void test_id__unique() { /** * Test which verifies that guac_generate_id() produces strings are in the - * correc UUID-based format. + * correct UUID-based format. */ void test_id__format() { From bb4a6b5e1661a5213dc33e585a113a1893167f3d Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 01:12:38 -0800 Subject: [PATCH 20/26] GUACAMOLE-1911: Fixed some typo mistakes ("whhich", "indiciating"). --- src/libguac/hash.c | 2 +- src/libguac/rwlock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/hash.c b/src/libguac/hash.c index 05e50025f..c8f4e69cb 100644 --- a/src/libguac/hash.c +++ b/src/libguac/hash.c @@ -25,7 +25,7 @@ #include /* - * Arbitrary hash function whhich maps ALL 32-bit numbers onto 24-bit numbers + * Arbitrary hash function which maps ALL 32-bit numbers onto 24-bit numbers * evenly, while guaranteeing that all 24-bit numbers are mapped onto * themselves. */ diff --git a/src/libguac/rwlock.c b/src/libguac/rwlock.c index e400c8e72..1584205b1 100644 --- a/src/libguac/rwlock.c +++ b/src/libguac/rwlock.c @@ -109,7 +109,7 @@ static uintptr_t get_lock_count(uintptr_t value) { * in the least-significant nibble, and the count in the rest. * * @param flag - * A flag indiciating which lock, if any, is held by the current thread. + * A flag indicating which lock, if any, is held by the current thread. * * @param count * The depth of the lock attempt by the current thread, i.e. the number of From c14edbfb2fea3c51e6184c2cdefd9306508056ce Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 01:16:52 -0800 Subject: [PATCH 21/26] GUACAMOLE-1911: Fixed some typo mistakes ("greated", "peform"). --- src/libguac/rwlock.c | 2 +- src/libguac/socket-broadcast.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/rwlock.c b/src/libguac/rwlock.c index 1584205b1..22d041b2d 100644 --- a/src/libguac/rwlock.c +++ b/src/libguac/rwlock.c @@ -139,7 +139,7 @@ static void* get_value_from_flag_and_count( static int would_overflow_count(uintptr_t current_count) { /** - * The count will overflow if it's already equal or greated to the maximum + * The count will overflow if it's already equal or greater to the maximum * possible value that can be stored in a uintptr_t excluding the first nibble. */ return current_count >= (UINTPTR_MAX >> 4); diff --git a/src/libguac/socket-broadcast.c b/src/libguac/socket-broadcast.c index 2d605feaf..99736ac2a 100644 --- a/src/libguac/socket-broadcast.c +++ b/src/libguac/socket-broadcast.c @@ -374,7 +374,7 @@ static int __guac_socket_broadcast_free_handler(guac_socket* socket) { * The client who's users are being broadcast to. * * @param broadcast_handler - * The handler that will peform the broadcast against a subset of users + * The handler that will perform the broadcast against a subset of users * of the provided client. * * @return From f6056e38545aa65ca885e174d3f9c7c5ef165f69 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 06:00:28 -0800 Subject: [PATCH 22/26] GUACAMOLE-1911: Fixed some typo mistakes ("outout", "Initialze"). --- src/libguac/socket-tee.c | 2 +- src/libguac/user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libguac/socket-tee.c b/src/libguac/socket-tee.c index 84710455d..bbdb1cf57 100644 --- a/src/libguac/socket-tee.c +++ b/src/libguac/socket-tee.c @@ -210,7 +210,7 @@ static int __guac_socket_tee_free_handler(guac_socket* socket) { guac_socket* guac_socket_tee(guac_socket* primary, guac_socket* secondary) { - /* Set up socket to split outout into a file */ + /* Set up socket to split out into a file */ guac_socket_tee_data* data = guac_mem_alloc(sizeof(guac_socket_tee_data)); data->primary = primary; data->secondary = secondary; diff --git a/src/libguac/user.c b/src/libguac/user.c index ba6819678..846d0eddd 100644 --- a/src/libguac/user.c +++ b/src/libguac/user.c @@ -60,7 +60,7 @@ guac_user* guac_user_alloc() { /* Allocate stream pool */ user->__stream_pool = guac_pool_alloc(0); - /* Initialze streams */ + /* Initialize streams */ user->__input_streams = guac_mem_alloc(sizeof(guac_stream), GUAC_USER_MAX_STREAMS); user->__output_streams = guac_mem_alloc(sizeof(guac_stream), GUAC_USER_MAX_STREAMS); From a0b835d154e2ec26a223023732b66a17039e8a83 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 06:27:13 -0800 Subject: [PATCH 23/26] GUACAMOLE-1911: Fixed some typo mistakes ("assocated", "Guacmaole", "joinging"). --- src/protocols/kubernetes/kubernetes.c | 4 ++-- src/terminal/terminal/scrollbar.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/protocols/kubernetes/kubernetes.c b/src/protocols/kubernetes/kubernetes.c index 3a75bb2e7..163c55626 100644 --- a/src/protocols/kubernetes/kubernetes.c +++ b/src/protocols/kubernetes/kubernetes.c @@ -48,7 +48,7 @@ * The reason (event) that this callback was invoked. * * @param user - * Arbitrary data assocated with the WebSocket session. In some cases, + * Arbitrary data associated with the WebSocket session. In some cases, * this is actually event-specific data (such as the * LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERT event). * @@ -286,7 +286,7 @@ void* guac_kubernetes_client_thread(void* data) { .user = client }; - /* Init WebSocket connection parameters which do not vary by Guacmaole + /* Init WebSocket connection parameters which do not vary by Guacamole * connection parameters or creation of future libwebsockets objects */ struct lws_client_connect_info connection_info = { .host = settings->hostname, diff --git a/src/terminal/terminal/scrollbar.h b/src/terminal/terminal/scrollbar.h index b33f57d43..5ffdf9f94 100644 --- a/src/terminal/terminal/scrollbar.h +++ b/src/terminal/terminal/scrollbar.h @@ -255,7 +255,7 @@ void guac_terminal_scrollbar_free(guac_terminal_scrollbar* scrollbar); void guac_terminal_scrollbar_flush(guac_terminal_scrollbar* scrollbar); /** - * Forces a complete redraw / resync of scrollbar state for all joinging users + * Forces a complete redraw / resync of scrollbar state for all joining users * associated with the provided socket, sending the necessary instructions to * completely recreate and redraw the scrollbar rendering over the given * socket. From 2a5e78ce6fba1274d5dfe34c9369dcf9a8f658b1 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 06:33:02 -0800 Subject: [PATCH 24/26] GUACAMOLE-1911: Fixed some typo mistakes ("contine", "avalable"). --- src/protocols/telnet/telnet.c | 2 +- src/terminal/common.c | 2 +- src/terminal/terminal/terminal-priv.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c index e4e2d9167..13e1b21e5 100644 --- a/src/protocols/telnet/telnet.c +++ b/src/protocols/telnet/telnet.c @@ -77,7 +77,7 @@ static int __guac_telnet_write_all(int fd, const char* buffer, int size) { if (ret_val <= 0) return -1; - /* If successful, contine with what data remains (if any) */ + /* If successful, continue with what data remains (if any) */ remaining -= ret_val; buffer += ret_val; diff --git a/src/terminal/common.c b/src/terminal/common.c index 36675f310..5f5509dbe 100644 --- a/src/terminal/common.c +++ b/src/terminal/common.c @@ -94,7 +94,7 @@ int guac_terminal_write_all(int fd, const char* buffer, int size) { if (ret_val <= 0) return -1; - /* If successful, contine with what data remains (if any) */ + /* If successful, continue with what data remains (if any) */ remaining -= ret_val; buffer += ret_val; diff --git a/src/terminal/terminal/terminal-priv.h b/src/terminal/terminal/terminal-priv.h index 24cbfec95..c937c1a7d 100644 --- a/src/terminal/terminal/terminal-priv.h +++ b/src/terminal/terminal/terminal-priv.h @@ -185,7 +185,7 @@ struct guac_terminal { int max_scrollback; /** - * The number of rows that the user has requested be avalable within the + * The number of rows that the user has requested be available within the * terminal buffer. This value may be adjusted by the user while the * terminal is running through console codes, and will adjust the number * of rows available within the terminal buffer, subject to the maximum From bd10897e64927ef06684a0a9ee603ac71b33e458 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 06:42:42 -0800 Subject: [PATCH 25/26] GUACAMOLE-1911: Fixed some typo mistakes ("cler", "inclusiveley", "specfying"). --- src/terminal/display.c | 2 +- src/terminal/select.c | 2 +- src/terminal/terminal-handlers.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/terminal/display.c b/src/terminal/display.c index b053bf78d..a89b26931 100644 --- a/src/terminal/display.c +++ b/src/terminal/display.c @@ -643,7 +643,7 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display) { for (row=0; rowheight; row++) { for (col=0; colwidth; col++) { - /* If operation is a cler operation (set to space) */ + /* If operation is a clear operation (set to space) */ if (current->type == GUAC_CHAR_SET && !guac_terminal_has_glyph(current->character.value)) { diff --git a/src/terminal/select.c b/src/terminal/select.c index 1698e3819..c70b19590 100644 --- a/src/terminal/select.c +++ b/src/terminal/select.c @@ -253,7 +253,7 @@ void guac_terminal_select_resume(guac_terminal* terminal, int row, int column) { /** * Appends the text within the given subsection of a terminal row to the - * clipboard. The provided coordinates are considered inclusiveley (the + * clipboard. The provided coordinates are considered inclusively (the * characters at the start and end column are included in the copied * text). Any out-of-bounds coordinates will be automatically clipped within * the bounds of the given row. diff --git a/src/terminal/terminal-handlers.c b/src/terminal/terminal-handlers.c index f5b10beb1..bba2c38c1 100644 --- a/src/terminal/terminal-handlers.c +++ b/src/terminal/terminal-handlers.c @@ -537,7 +537,7 @@ static int guac_terminal_parse_xterm256_index(guac_terminal* terminal, /** * Parses an xterm SGR sequence specifying the index of a color within the - * 256-color palette, or specfying the RGB values of a color. The number of + * 256-color palette, or specifying the RGB values of a color. The number of * arguments required by these sequences varies. If a 256-color sequence is * recognized, the number of arguments parsed is returned. * From aca25d2a1bcfb82610f55eca3a809bc2e377aeea Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 22 Jan 2024 07:00:20 -0800 Subject: [PATCH 26/26] GUACAMOLE-1911: Fixed some typo mistakes ("Reraw", "typescripe"). --- src/terminal/terminal.c | 2 +- src/terminal/terminal/typescript.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 77141aa70..9369db1f6 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -1304,7 +1304,7 @@ static void __guac_terminal_resize(guac_terminal* term, int width, int height) { guac_terminal_display_flush(term->display); guac_terminal_display_resize(term->display, width, height); - /* Reraw any characters on right if widening */ + /* Redraw any characters on right if widening */ if (width > term->term_width) __guac_terminal_redraw_rect(term, 0, term->term_width-1, height-1, width-1); diff --git a/src/terminal/terminal/typescript.h b/src/terminal/terminal/typescript.h index 5edf178f7..941dd99f9 100644 --- a/src/terminal/terminal/typescript.h +++ b/src/terminal/terminal/typescript.h @@ -120,7 +120,7 @@ typedef struct guac_terminal_typescript { /** * The last time that this typescript was flushed. If this typescript was - * never flushed, this will be the time the typescripe was created. + * never flushed, this will be the time the typescript was created. */ guac_timestamp last_flush;