[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] json: Remove invalid typedef redefinition

From: Patrick Steinhardt
Subject: [PATCH] json: Remove invalid typedef redefinition
Date: Wed, 27 May 2020 11:18:24 +0200

The C standard does not allow for typedef redefinitions, even if they
map to the same underlying type. In order to avoid including the
"jsmn.h" in "json.h" and thus exposing jsmn's internals, we have exactly
such a forward-declaring typedef in "json.h". If enforcing the GNU99 C
standard, clang may generate a warning about this non-standard

Fix the issue by using a simple `struct jsmntok` forward declaration
instead of using a typedef.

Signed-off-by: Patrick Steinhardt <address@hidden>

Sorry for the late response, didn't notice at first that this directly
impacts code I wrote. I don't have Clang available on my computer and
GCC seems to lack the equivalent option for this, so I wasn't able to
reproduce the warning. Below patch should fix the issue, though, as we
simply avoid using a typedef for the forward declaration.

 grub-core/lib/json/json.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/grub-core/lib/json/json.h b/grub-core/lib/json/json.h
index d9f99454d..2e2b0bd07 100644
--- a/grub-core/lib/json/json.h
+++ b/grub-core/lib/json/json.h
@@ -36,13 +36,14 @@ enum grub_json_type
 typedef enum grub_json_type grub_json_type_t;
-typedef struct jsmntok jsmntok_t;
+/* Forward-declaration to avoid including "jsmn.h" */
+struct jsmntok;
 struct grub_json
-  jsmntok_t   *tokens;
-  char       *string;
-  grub_size_t idx;
+  struct jsmntok *tokens;
+  char          *string;
+  grub_size_t   idx;
 typedef struct grub_json grub_json_t;

Attachment: signature.asc
Description: PGP signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]