From 562ffe8945ba7e8652f572a5966c9b9f1a2c8e76 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Sun, 28 Feb 2021 06:49:36 +0100 Subject: [PATCH] Mayaqua/Pack: Fix PackGetStrSize() and PackGetStrSizeEx()'s return data type The bug caused ProtoOptionsGet and ProtoOptionsSet not to work anymore after c90617e0e86dedf78e0e3c8a71263a80eec29caa. The functions were introduced in aa65327e737e2d595fe4b0897620d0f4dbf3c023, but the issue went unnoticed because bool was the same as UINT. --- src/Mayaqua/Pack.c | 4 ++-- src/Mayaqua/Pack.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mayaqua/Pack.c b/src/Mayaqua/Pack.c index 5c11061f..f561b72c 100644 --- a/src/Mayaqua/Pack.c +++ b/src/Mayaqua/Pack.c @@ -1430,11 +1430,11 @@ bool PackGetStrEx(PACK *p, char *name, char *str, UINT size, UINT index) } // Get the string size from the PACK -bool PackGetStrSize(PACK *p, char *name) +UINT PackGetStrSize(PACK *p, char *name) { return PackGetStrSizeEx(p, name, 0); } -bool PackGetStrSizeEx(PACK *p, char *name, UINT index) +UINT PackGetStrSizeEx(PACK *p, char *name, UINT index) { ELEMENT *e; // Validate arguments diff --git a/src/Mayaqua/Pack.h b/src/Mayaqua/Pack.h index 2260d4cd..319b9079 100644 --- a/src/Mayaqua/Pack.h +++ b/src/Mayaqua/Pack.h @@ -143,8 +143,8 @@ ELEMENT *PackAddData(PACK *p, char *name, void *data, UINT size); ELEMENT *PackAddDataEx(PACK *p, char *name, void *data, UINT size, UINT index, UINT total); ELEMENT *PackAddBuf(PACK *p, char *name, BUF *b); ELEMENT *PackAddBufEx(PACK *p, char *name, BUF *b, UINT index, UINT total); -bool PackGetStrSize(PACK *p, char *name); -bool PackGetStrSizeEx(PACK *p, char *name, UINT index); +UINT PackGetStrSize(PACK *p, char *name); +UINT PackGetStrSizeEx(PACK *p, char *name, UINT index); bool PackGetStr(PACK *p, char *name, char *str, UINT size); bool PackGetStrEx(PACK *p, char *name, char *str, UINT size, UINT index); bool PackGetUniStr(PACK *p, char *name, wchar_t *unistr, UINT size);