ico: Changes to 'master'

[GitLab Mirror]

 ico.c |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

New commits:
commit c125d8bac5b1629e36069c13a13919e542dc3a9b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Aug 13 16:04:06 2022 -0700

    Add cast to clear -Wsign-compare warning
    
    ico.c: In function ‘do_ico_window’:
    ico.c:1084:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
        if (xev.xclient.data.l[0] == wm_delete_window)
                                  ^~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit fc54ce8a6f248e465a518f807dd5e51657b6e535
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Aug 13 15:59:06 2022 -0700

    Rename global "poly" to fix gcc -Wshadow warnings
    
    ico.c: In function ‘initPoly’:
    ico.c:472:45: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow]
     initPoly(struct closure *closure, Polyinfo *poly, int icoW, int icoH)
                                                 ^~~~
    ico.c:238:18: note: shadowed declaration is here
     static Polyinfo *poly;  /* -obj: the poly to draw */
                      ^~~~
    ico.c: In function ‘drawPoly’:
    ico.c:567:45: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow]
     drawPoly(struct closure *closure, Polyinfo *poly, GC gc,
                                                 ^~~~
    ico.c:238:18: note: shadowed declaration is here
     static Polyinfo *poly;  /* -obj: the poly to draw */
                      ^~~~
    ico.c: In function ‘giveObjHelp’:
    ico.c:1137:13: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow]
       Polyinfo *poly = polygons+i;
                 ^~~~
    ico.c:238:18: note: shadowed declaration is here
     static Polyinfo *poly;  /* -obj: the poly to draw */
                      ^~~~
    ico.c: In function ‘findpoly’:
    ico.c:1152:13: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow]
       Polyinfo *poly = polygons+i;
                 ^~~~
    ico.c:238:18: note: shadowed declaration is here
     static Polyinfo *poly;  /* -obj: the poly to draw */
                      ^~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 9e5fe5ae18c3f6eae93cd1521645717295ce2c23
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Aug 13 15:56:22 2022 -0700

    Apply scope reduction suggestions from cppcheck
    
    [ico.c:587]: (style) The scope of the variable 'pxvz' can be reduced.
    [ico.c:730]: (style) The scope of the variable 't' can be reduced.
    [ico.c:1132]: (style) The scope of the variable 'poly' can be reduced.
    [ico.c:1149]: (style) The scope of the variable 'poly' can be reduced.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>