• Jeremy Huddleston's avatar
    security: Silence some benign -Wformat warnings · a7a00e4b
    Jeremy Huddleston authored
    XID may be either 'unsigned long' or 'unsigned int' depending on:
    
    typedef unsigned long CARD64;
    typedef unsigned int CARD32;
    typedef unsigned long long CARD64;
    typedef unsigned long CARD32;
    
    typedef unsigned long XID;
    typedef CARD32 XID;
    
    so when building with -Wformat, we get some warnings that are benign.  This silences them.
    
    security.c:215:52: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
        SecurityAudit("revoked authorization ID %d\n", pAuth->id);
                                                ~~     ^~~~~~~~~
                                                %lu
      CC       dpmsstubs.lo
    security.c:553:25: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
             client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
                            ^~~~~~~~~
    security.c:553:55: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long')
          [-Wformat,Format String Issue]
             client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
                                                          ^~~~~~~~~~~~~~
    security.c:554:10: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
             pAuth->group, eventMask);
             ^~~~~~~~~~~~
    security.c:554:24: warning: format specifies type 'int' but the argument has type 'Mask' (aka 'unsigned long')
          [-Wformat,Format String Issue]
             pAuth->group, eventMask);
                           ^~~~~~~~~
    security.c:781:19: warning: format specifies type 'unsigned int' but the argument has type 'Mask' (aka 'unsigned
    long')
          [-Wformat,Format String Issue]
                      requested, rec->id, cid,
                      ^~~~~~~~~
    security.c:781:30: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
                      requested, rec->id, cid,
                                 ^~~~~~~
    security.c:863:23: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
                          rec->pWin->drawable.id, wClient(rec->pWin)->index,
                          ^~~~~~~~~~~~~~~~~~~~~~
    security.c:893:31: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
                                  rec->pWin->drawable.id,
                                  ^~~~~~~~~~~~~~~~~~~~~~
    security.c:915:39: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
          [-Wformat,Format String Issue]
                      rec->client->index, rec->pWin->drawable.id,
                                          ^~~~~~~~~~~~~~~~~~~~~~
    Signed-off-by: default avatarJeremy Huddleston Sequoia <jeremyhu@apple.com>
    Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
    a7a00e4b
security.c 34.7 KB