libX11: Changes to 'master'

[GitLab Mirror]

 src/GetAtomNm.c          |    1 -
 src/xlibi18n/lcCharSet.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 30656fd66ad47aeaca0bfc237a818f189554f07e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 1 12:21:04 2019 -0800

    Fix implicit conversion warnings in _XlcCreateDefaultCharSet
    
    lcCharSet.c:187:50: warning: implicit conversion changes signedness:
          'int' to 'unsigned long' [-Wsign-conversion]
        tmp = Xmalloc(name_len + 1 + ct_sequence_len + 1);
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
    ../../include/X11/Xlibint.h:453:32: note: expanded from macro 'Xmalloc'
                           ~~~~~~  ^~~~
    lcCharSet.c:192:31: warning: implicit conversion changes signedness:
          'int' to 'unsigned long' [-Wsign-conversion]
        memcpy(tmp, name, name_len+1);
        ~~~~~~            ~~~~~~~~^~
    lcCharSet.c:216:45: warning: implicit conversion changes signedness:
          'int' to 'unsigned long' [-Wsign-conversion]
        memcpy(tmp, ct_sequence, ct_sequence_len+1);
        ~~~~~~                   ~~~~~~~~~~~~~~~^~
    lcCharSet.c:183:16: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        name_len = strlen(name);
                 ~ ^~~~~~~~~~~~
    lcCharSet.c:184:23: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        ct_sequence_len = strlen(ct_sequence);
                        ~ ^~~~~~~~~~~~~~~~~~~
    lcCharSet.c:198:37: warning: implicit conversion loses integer precision:
         'long' to 'unsigned int' [-Wshorten-64-to-32]
            unsigned int length = colon - charset->name;
                         ~~~~~~   ~~~~~~^~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 2e6300905784fa8adfcea019262ea58b3e1ed4ad
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 1 11:41:47 2019 -0800

    Remove no-longer-used name variable in _XGetAtomName
    
    Fixes gcc warning:
    GetAtomNm.c: In function ‘_XGetAtomName’:
    GetAtomNm.c:39:11: warning: unused variable ‘name’ [-Wunused-variable]
         char *name;
               ^~~~
    
    Introduced by commit 336c1e7a505698a8f3bcb6eb96dbbb8ed21ade96
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>