code.ossystems Code Review - openembedded-core.git/blob

   1 From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001
   2 From: Dimitry Andric <dim@FreeBSD.org>
   3 Date: Wed, 19 Aug 2020 03:35:16 +0000
   4 Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer
   5
   6 Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast):
   7 ../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast]
   8         *token_p = (GTokenType) value_p->v_symbol;
   9                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  10
  11 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64]
  12 Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
  13 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  14 ---
  15  json-glib/json-scanner.c | 2 +-
  16  1 file changed, 1 insertion(+), 1 deletion(-)
  17
  18 diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c
  19 index 0c9919f..59dd29c 100644
  20 --- a/json-glib/json-scanner.c
  21 +++ b/json-glib/json-scanner.c
  22 @@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner       *scanner,
  23
  24      case G_TOKEN_SYMBOL:
  25        if (scanner->config->symbol_2_token)
  26 -       *token_p = (GTokenType) value_p->v_symbol;
  27 +       *token_p = GPOINTER_TO_INT (value_p->v_symbol);
  28        break;
  29
  30      case G_TOKEN_BINARY:
  31 --
  32 2.28.0
  33