libxkbfile: Changes to 'master'

[GitLab Mirror]

 include/X11/extensions/XKBconfig.h |    3 ++
 src/xkbconfig.c                    |    3 ++
 src/xkbtext.c                      |   40 ++++++++++++++++++-------------------
 src/xkmread.c                      |   10 +++++++--
 4 files changed, 34 insertions(+), 22 deletions(-)

New commits:
commit 3ba601efc462d0c39598aab8216580cdcf025c6a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 8 10:04:52 2025 -0800

    xkbtext.c: Fix -Wdiscarded-qualifiers warnings for actionTypeNames
    
    Gets rid of 20 -Wdiscarded-qualifiers warnings from gcc 14.2
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/merge_requests/25>

commit 54212cb9f169056d6c5aebe8aeca1f588188e409
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 8 09:55:20 2025 -0800

    xkbtext.c: Fix -Wdiscarded-qualifiers warnings for siMatchText
    
    Gets rid of 5 -Wdiscarded-qualifiers warnings from gcc 14.2
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/merge_requests/25>

commit 10ded9a5ff374ad4e365260bd8ea878bf04c9b5c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 8 09:36:47 2025 -0800

    XKBconfig.h: allow declaring XkbConfigFieldRec.field as const char *
    
    Gets rid of 49 -Wdiscarded-qualifiers warnings from gcc in xkbconfig.c
    while preserving API compatibility for callers that don't set the flag.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/merge_requests/25>

commit ba407357b0f00e369ee5a4917d0a63781cd7e491
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Mar 7 18:15:12 2025 -0800

    xkbtext.c: avoid -Wanalyzer-null-argument warning
    
    I don't think the gcc 14.2 analyzer warning is correct, but this
    makes the code easier for both humans and analyzers to follow anyway
    and gets rid of the warning:
    
    xkbtext.c: In function ‘XkbVModIndexText’:
    xkbtext.c:151:9: warning: use of NULL ‘rtrn’ where non-null expected
     [CWE-476] [-Wanalyzer-null-argument]
      151 |         strncpy(rtrn, tmp, len);
          |         ^~~~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/merge_requests/25>

commit f60a740272db682291014f4c30b9f45a41a67f81
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Mar 7 17:48:24 2025 -0800

    xkmread.c: Verify reads in XkmReadFileSection() & XkmReadFileSectionName()
    
    Check the return values from fread to make sure the elements are
    actually getting read from the file.
    
    Clears -Wunused-result warnings reported in #5
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/merge_requests/25>