xdm: Changes to 'master'

[Jeremy Huddleston]

 chooser/chooser.c   |    1 +
 include/dm.h        |    8 ++++----
 include/dm_socket.h |    4 ++++
 xdm/netaddr.c       |    4 ++++
 xdm/protodpy.c      |   13 +++++++------
 xdm/reset.c         |    1 +
 xdm/server.c        |    5 +++++
 xdm/session.c       |    4 ++++
 8 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit c0c3ad0cc5a6e5cf528245fb7f4e47b91163333c
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 18 22:35:00 2015 -0700

    Fixup various format warnings in PrintProtoDisplay
    
    protodpy.c:52:35: warning: format specifies type 'unsigned int' but the argument has type 'struct protoDisplay *' [-Wformat]
        Debug ("ProtoDisplay 0x%x\n", pdpy);
                               ~~     ^~~~
    protodpy.c:54:20: warning: incompatible pointer types passing 'XdmcpNetaddr' (aka 'char *') to parameter of type 'struct sockaddr *'
          [-Wincompatible-pointer-types]
        PrintSockAddr (pdpy->address, pdpy->addrlen);
                       ^~~~~~~~~~~~~
    ../include/dm_socket.h:46:45: note: passing argument to parameter 'a' here
    extern void PrintSockAddr (struct sockaddr *a, int len);
                                                ^
    protodpy.c:55:41: warning: format specifies type 'int' but the argument has type 'unsigned long' [-Wformat]
        Debug ("\tdate %d (%d from now)\n", pdpy->date, time(0) - pdpy->date);
                       ~~                   ^~~~~~~~~~
                       %lu
    protodpy.c:55:53: warning: format specifies type 'int' but the argument has type 'unsigned long' [-Wformat]
        Debug ("\tdate %d (%d from now)\n", pdpy->date, time(0) - pdpy->date);
                           ~~                           ^~~~~~~~~~~~~~~~~~~~
                           %lu
    protodpy.c:57:32: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long') [-Wformat]
        Debug ("\tsessionID %d\n", pdpy->sessionID);
                            ~~     ^~~~~~~~~~~~~~~
                            %lu
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

commit d5aa455a2575fca74219bb567ae4cb8c63a8401d
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 18 22:21:05 2015 -0700

    Silence -Wmissing-noreturn warnings
    
    choose.c:463:1: warning: function 'RunChooser' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    chooser.c:1062:1: warning: function 'DoCancel' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    reset.c:81:1: warning: function 'abortReset' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    server.c:154:1: warning: function 'serverPauseAbort' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    server.c:161:1: warning: function 'serverPauseUsr1' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    server.c:236:1: warning: function 'abortOpen' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    server.c:329:1: warning: function 'PingLost' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    server.c:348:1: warning: function 'PingLostSig' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:231:1: warning: function 'catchTerm' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:293:1: warning: function 'SessionPingFailed' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:240:1: warning: function 'catchAlrm' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:249:1: warning: function 'waitAbort' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:330:1: warning: function 'ManageSession' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:471:1: warning: function 'syncTimeout' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    session.c:519:1: warning: function 'SessionExit' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

commit 6cc5153d77f9f48b8dd16e17e48eac4d6ef13929
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 18 22:13:31 2015 -0700

    Add missing prototype for PrintSockAddr
    
    protodpy.c:53:5: error: implicit declaration of function 'PrintSockAddr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        PrintSockAddr (pdpy->address, pdpy->addrlen);
        ^
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

commit 68de911889c66133cc6e2f5c64b18a02e84de500
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 18 22:12:14 2015 -0700

    Add missing return type (void) for PrintProtoDisplay
    
    protodpy.c:49:1: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int]
    PrintProtoDisplay (struct protoDisplay *pdpy)
    ^
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

commit 0d8bb02d5ab7af1dc505987c9468c11caf3b889d
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 18 22:10:41 2015 -0700

    xdm: Add missing include of <arpa/inet.h> for inet_ntop
    
    netaddr.c:226:2: error: implicit declaration of function 'inet_ntop' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
            inet_ntop(a->sa_family, &((struct sockaddr_in6 *) a)->sin6_addr,
            ^
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>