mkfontscale: Changes to 'master'

[GitLab Mirror]

 ident.c       |   13 +++++++------
 mkfontscale.c |   29 +++++++++++++++--------------
 2 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 0a20abea3ec9742f0982e043e725cdadf0fc493e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jan 6 14:26:00 2019 -0800

    Clear some -Wshorten-64-to-32 warnings from clang 6
    
    ident.c:84:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(filename);
            ~   ^~~~~~~~~~~~~~~~
    ident.c:130:9: warning: implicit conversion loses integer precision:
          'off64_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
            return gzseek(ff->f.gz, offset, whence);
            ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ident.c:140:17: warning: implicit conversion loses integer precision:
          'long' to 'int' [-Wshorten-64-to-32]
                n = offset - ff->pos;
                  ~ ~~~~~~~^~~~~~~~~
    ident.c:143:10: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
                n = offset;
                  ~ ^~~~~~
    ident.c:156:12: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'unsigned int' [-Wshorten-64-to-32]
            ff->pos = offset;
                    ~ ^~~~~~
    ident.c:157:9: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
            return offset;
            ~~~~~~ ^~~~~~
    mkfontscale.c:704:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(dirname);
            ~   ^~~~~~~~~~~~~~~
    mkfontscale.c:748:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(filename);
            ~   ^~~~~~~~~~~~~~~~
    mkfontscale.c:794:14: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
            xl = strlen (exclusionSuffix);
               ~ ^~~~~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:796:9: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        i = strlen(dirname_given);
          ~ ^~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:858:15: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
                int dl = strlen (entry->d_name);
                    ~~   ^~~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:930:21: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
                int l = strlen(xlfd_name);
                    ~   ^~~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit a311033403730db56bbbd0c56977e6c49a6b5519
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jan 6 13:33:42 2019 -0800

    Clear some -Wsign-compare warnings from gcc 7
    
    mkfontscale.c: In function ‘getName’:
    mkfontscale.c:336:22: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
             for(i = 0; i < name.string_len / 2; i++) {
                          ^
    mkfontscale.c: In function ‘nameWidth’:
    mkfontscale.c:427:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < NUMWIDTHS; i++)
                      ^
    mkfontscale.c: In function ‘notice_foundry’:
    mkfontscale.c:1261:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < countof(notice_foundries); i++)
                      ^
    mkfontscale.c: In function ‘vendor_foundry’:
    mkfontscale.c:1285:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < countof(vendor_foundries); i++)
                      ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>