From 6ca1a0c9f6252242fa11e966f3779ba94af684c1 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 27 Dec 2019 14:17:55 +0200 Subject: parser: use int64_t for all numbers Don't use int which can have different size on different machines. Also avoid some warnings from MSVC: xkbcomp/parser.y(760): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data xkbcomp/parser.y(761): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data xkbcomp/parser.y(767): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data Signed-off-by: Ran Benita --- src/xkbcomp/parser.y | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y index 4838eaa..45f9d90 100644 --- a/src/xkbcomp/parser.y +++ b/src/xkbcomp/parser.y @@ -162,7 +162,6 @@ resolve_keysym(const char *name, xkb_keysym_t *sym_rtrn) %start XkbFile %union { - int ival; int64_t num; enum xkb_file_type file_type; char *str; @@ -195,8 +194,7 @@ resolve_keysym(const char *name, xkb_keysym_t *sym_rtrn) %type INTEGER FLOAT %type IDENT STRING %type KEYNAME -%type KeyCode -%type Number Integer Float SignedNumber DoodadType +%type KeyCode Number Integer Float SignedNumber DoodadType %type MergeMode OptMergeMode %type XkbCompositeType FileType %type Flag Flags OptFlags @@ -736,15 +734,15 @@ KeySym : IDENT | Integer { if ($1 < 0) { - parser_warn(param, "unrecognized keysym \"%d\"", $1); + parser_warn(param, "unrecognized keysym \"%ld\"", $1); $$ = XKB_KEY_NoSymbol; } else if ($1 < 10) { /* XKB_KEY_0 .. XKB_KEY_9 */ $$ = XKB_KEY_0 + (xkb_keysym_t) $1; } else { - char buf[17]; - snprintf(buf, sizeof(buf), "0x%x", $1); + char buf[32]; + snprintf(buf, sizeof(buf), "0x%lx", $1); if (!resolve_keysym(buf, &$$)) { parser_warn(param, "unrecognized keysym \"%s\"", buf); $$ = XKB_KEY_NoSymbol; -- cgit v1.2.1