From 75370e464d8a736858b9b293809951577f5c57c5 Mon Sep 17 00:00:00 2001 From: Quantum Date: Fri, 18 Mar 2022 02:13:56 -0400 Subject: [PATCH] [client] overlay/msg: fix type for app_msgBoxClose It should not be taking a pointer to MsgBoxHandle. Also changed the type of MsgBoxHandle to prevent similar bugs. --- client/include/app.h | 4 ++-- client/src/app.c | 2 +- client/src/overlay/msg.c | 2 +- client/src/overlay/msg.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/include/app.h b/client/include/app.h index 783449a4..9143e02e 100644 --- a/client/include/app.h +++ b/client/include/app.h @@ -138,14 +138,14 @@ void app_clipboardRequest(const LG_ClipboardReplyFn replyFn, void * opaque); */ void app_alert(LG_MsgAlert type, const char * fmt, ...); -typedef void * MsgBoxHandle; +typedef struct MsgBoxHandle * MsgBoxHandle; MsgBoxHandle app_msgBox(const char * caption, const char * fmt, ...); typedef void (*MsgBoxConfirmCallback)(bool yes, void * opaque); MsgBoxHandle app_confirmMsgBox(const char * caption, MsgBoxConfirmCallback callback, void * opaque, const char * fmt, ...); -void app_msgBoxClose(MsgBoxHandle * handle); +void app_msgBoxClose(MsgBoxHandle handle); typedef struct KeybindHandle * KeybindHandle; typedef void (*KeybindFn)(int sc, void * opaque); diff --git a/client/src/app.c b/client/src/app.c index 19202fff..be050bf8 100644 --- a/client/src/app.c +++ b/client/src/app.c @@ -665,7 +665,7 @@ MsgBoxHandle app_confirmMsgBox(const char * caption, return handle; } -void app_msgBoxClose(MsgBoxHandle * handle) +void app_msgBoxClose(MsgBoxHandle handle) { if (!handle) return; diff --git a/client/src/overlay/msg.c b/client/src/overlay/msg.c index 02694083..e13b2b9f 100644 --- a/client/src/overlay/msg.c +++ b/client/src/overlay/msg.c @@ -219,7 +219,7 @@ MsgBoxHandle overlayMsg_show( return (MsgBoxHandle)msg; } -void overlayMsg_close(MsgBoxHandle * handle) +void overlayMsg_close(MsgBoxHandle handle) { if (ll_removeData(l_msg.messages, handle)) freeMsg((struct Msg *)handle); diff --git a/client/src/overlay/msg.h b/client/src/overlay/msg.h index 96c59844..3bd8a121 100644 --- a/client/src/overlay/msg.h +++ b/client/src/overlay/msg.h @@ -32,6 +32,6 @@ MsgBoxHandle overlayMsg_show( const char * caption, MsgBoxConfirmCallback confirm, void * opaque, const char * fmt, va_list args); -void overlayMsg_close(MsgBoxHandle * handle); +void overlayMsg_close(MsgBoxHandle handle); #endif