This is an automated email from the ASF dual-hosted git repository.

jmuehlner pushed a commit to branch staging/1.5.4
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 690808dabd5be3cbb01482b3a527dbfd9170f424
Merge: 4e1983a3 7f6cf202
Author: James Muehlner <[email protected]>
AuthorDate: Wed Oct 25 20:33:38 2023 -0700

    GUACAMOLE-1867: Merge new libguac memory convenience functions.

 doc/libguac/Doxyfile.in                            |   3 +-
 src/common-ssh/buffer.c                            |   6 +-
 src/common-ssh/common-ssh/ssh.h                    |   2 +-
 src/common-ssh/key.c                               |  14 +-
 src/common-ssh/sftp.c                              |  21 +-
 src/common-ssh/ssh.c                               |  22 +-
 src/common-ssh/tests/sftp/normalize_path.c         |  24 +-
 src/common-ssh/user.c                              |  17 +-
 src/common/clipboard.c                             |  10 +-
 src/common/common/cursor.h                         |   2 +-
 src/common/common/string.h                         |  32 +-
 src/common/cursor.c                                |  17 +-
 src/common/display.c                               |  15 +-
 src/common/list.c                                  |  12 +-
 src/common/string.c                                |  21 +-
 src/common/surface.c                               |  33 +-
 src/common/tests/Makefile.am                       |   3 +-
 src/common/tests/string/split.c                    |  13 +-
 src/guacd/conf-args.c                              |  23 +-
 src/guacd/conf-file.c                              |  32 +-
 src/guacd/connection.c                             |  11 +-
 src/guacd/daemon.c                                 |   9 +-
 src/guacd/proc-map.c                               |   5 +-
 src/guacd/proc.c                                   |  13 +-
 src/guacenc/buffer.c                               |   9 +-
 src/guacenc/cursor.c                               |   8 +-
 src/guacenc/display.c                              |   5 +-
 src/guacenc/ffmpeg-compat.c                        |  12 +-
 src/guacenc/image-stream.c                         |  14 +-
 src/guacenc/image-stream.h                         |   6 +-
 src/guacenc/jpeg.c                                 |   5 +-
 src/guacenc/layer.c                                |  10 +-
 src/guacenc/video.c                                |   5 +-
 src/guaclog/keydef.c                               |  15 +-
 src/guaclog/state.c                                |   7 +-
 src/libguac/Makefile.am                            |  19 +
 src/libguac/argv.c                                 |   5 +-
 src/libguac/audio.c                                |   7 +-
 src/libguac/client.c                               |  21 +-
 src/libguac/encode-jpeg.c                          |   7 +-
 src/libguac/encode-png.c                           |   9 +-
 src/libguac/error.c                                |  13 +-
 src/libguac/guacamole/mem.h                        | 413 +++++++++++++++++++++
 src/libguac/guacamole/private/mem.h                | 317 ++++++++++++++++
 src/libguac/guacamole/string.h                     |  13 +-
 src/libguac/id.c                                   |   5 +-
 src/libguac/id.h                                   |  11 +-
 src/libguac/mem.c                                  | 251 +++++++++++++
 src/libguac/palette.c                              |   6 +-
 src/libguac/parser.c                               |   5 +-
 src/libguac/pool.c                                 |  13 +-
 src/libguac/raw_encoder.c                          |  14 +-
 src/libguac/raw_encoder.h                          |   2 +-
 src/libguac/recording.c                            |   5 +-
 src/libguac/socket-broadcast.c                     |   5 +-
 src/libguac/socket-fd.c                            |   5 +-
 src/libguac/socket-nest.c                          |   5 +-
 src/libguac/socket-ssl.c                           |   7 +-
 src/libguac/socket-tee.c                           |   5 +-
 src/libguac/socket-wsa.c                           |   5 +-
 src/libguac/socket.c                               |   5 +-
 src/libguac/string.c                               |  16 +-
 src/libguac/tests/Makefile.am                      |  14 +
 src/libguac/tests/assert-signal.h                  |  67 ++++
 src/libguac/tests/id/generate.c                    |  11 +-
 src/libguac/tests/mem/alloc.c                      |  73 ++++
 src/libguac/tests/mem/ckd_add.c                    | 103 +++++
 src/libguac/tests/mem/ckd_add_or_die.c             |  72 ++++
 src/libguac/tests/mem/ckd_mul.c                    |  99 +++++
 src/libguac/tests/mem/ckd_mul_or_die.c             |  68 ++++
 src/libguac/tests/mem/ckd_sub.c                    | 105 ++++++
 src/libguac/tests/mem/ckd_sub_or_die.c             |  74 ++++
 src/libguac/tests/mem/free.c                       |  63 ++++
 src/libguac/tests/mem/realloc.c                    | 118 ++++++
 src/libguac/tests/mem/realloc_or_die.c             | 120 ++++++
 src/libguac/tests/mem/zalloc.c                     | 102 +++++
 src/libguac/tests/string/strdup.c                  |   5 +-
 src/libguac/user-handlers.c                        |  19 +-
 src/libguac/user-handshake.c                       |   5 +-
 src/libguac/user.c                                 |  26 +-
 src/protocols/kubernetes/client.c                  |   5 +-
 src/protocols/kubernetes/kubernetes.c              |   3 +-
 src/protocols/kubernetes/settings.c                |  33 +-
 src/protocols/rdp/argv.c                           |  16 +-
 src/protocols/rdp/beep.c                           |   7 +-
 .../rdp/channels/audio-input/audio-buffer.c        |  28 +-
 .../rdp/channels/audio-input/audio-buffer.h        |   4 +-
 src/protocols/rdp/channels/cliprdr.c               |  11 +-
 src/protocols/rdp/channels/common-svc.c            |   5 +-
 src/protocols/rdp/channels/disp.c                  |   5 +-
 src/protocols/rdp/channels/pipe-svc.c              |   5 +-
 .../rdp/channels/rdpdr/rdpdr-fs-messages.c         |   5 +-
 src/protocols/rdp/channels/rdpdr/rdpdr.c           |   5 +-
 src/protocols/rdp/channels/rdpei.c                 |   5 +-
 src/protocols/rdp/channels/rdpsnd/rdpsnd.c         |   6 +-
 src/protocols/rdp/client.c                         |   5 +-
 src/protocols/rdp/download.c                       |  11 +-
 src/protocols/rdp/fs.c                             |  17 +-
 src/protocols/rdp/glyph.c                          |   5 +-
 src/protocols/rdp/keyboard.c                       |   5 +-
 src/protocols/rdp/ls.c                             |   5 +-
 src/protocols/rdp/plugins/channels.c               |   3 +-
 .../rdp/plugins/guac-common-svc/guac-common-svc.c  |   3 +-
 src/protocols/rdp/plugins/guacai/guacai.c          |  13 +-
 src/protocols/rdp/print-job.c                      |   7 +-
 src/protocols/rdp/rdp.c                            |   7 +-
 src/protocols/rdp/settings.c                       |  75 ++--
 src/protocols/rdp/tests/fs/normalize_path.c        |  20 +-
 src/protocols/rdp/upload.c                         |   7 +-
 src/protocols/ssh/client.c                         |   5 +-
 src/protocols/ssh/settings.c                       |  45 +--
 src/protocols/ssh/ssh.c                            |   3 +-
 src/protocols/ssh/ssh_agent.c                      |   3 +-
 src/protocols/telnet/client.c                      |   5 +-
 src/protocols/telnet/input.c                       |   5 +-
 src/protocols/telnet/settings.c                    |  39 +-
 src/protocols/telnet/telnet.c                      |   3 +-
 src/protocols/vnc/argv.c                           |  12 +-
 src/protocols/vnc/client.c                         |   5 +-
 src/protocols/vnc/cursor.c                         |   5 +-
 src/protocols/vnc/display.c                        |   5 +-
 src/protocols/vnc/settings.c                       |  45 +--
 src/pulse/pulse.c                                  |   5 +-
 src/terminal/buffer.c                              |  20 +-
 src/terminal/display.c                             |  15 +-
 src/terminal/scrollbar.c                           |   5 +-
 src/terminal/terminal.c                            |  30 +-
 src/terminal/terminal/terminal.h                   |   2 +-
 src/terminal/typescript.c                          |  11 +-
 129 files changed, 2813 insertions(+), 570 deletions(-)

Reply via email to