libSM: Changes to 'master'

[Alan Coopersmith]

 doc/SMlib.xml          |    4 -
 include/X11/SM/SMlib.h |    4 -
 src/SMlibint.h         |   10 +--
 src/sm_client.c        |   26 +++-----
 src/sm_genid.c         |  146 +++++++++++++++++++++++--------------------------
 src/sm_manager.c       |   14 ++--
 src/sm_misc.c          |   32 ++--------
 src/sm_process.c       |   10 +--
 8 files changed, 109 insertions(+), 137 deletions(-)

New commits:
commit 3ca545c7835b71b63f8c5a8f758b08418a65a5bb
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Dec 5 20:04:51 2011 -0800

    unifdef -ULynx
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 4af9e4a71f7c07da86ef1940cba69e92b11ba337
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 11:33:30 2011 -0800

    SmsInitialize: Mark vendor & release args as const char *
    
    Needed to fix gcc -Wwrite-strings arguments in callers such as xsm.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit e77dd2e4bc8227ebdab70b4233cb33ed690fa264
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 10:33:15 2011 -0800

    Remove a bunch of unnecessary casts with malloc & free calls
    
    With modern compilers and headers, they cause more problems than they
    solve and just hide real issues.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 46f3ef4460aa2c1c2cba22897694a1cea572d506
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 10:23:24 2011 -0800

    Replace malloc(strlen) + strcpy sets with strdup calls
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit fb3ef5844d392f70cc6bd9b0d8770ca17bde1428
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 10:13:02 2011 -0800

    Reindent IPv4 code to match IPv6 code
    
    Takes care of the other block of code confusingly sharing indent levels
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 638496507882f0afe506fe294f68ad5290ef95db
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 10:07:32 2011 -0800

    Move variable declarations to get rid of unnecessary scope brackets
    
    Gets rid of one of the multiple levels of bracketing that confusingly
    shared the same indent level.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 9f350d75a4553d8e2bc365f8de4110bb79ec7b32
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 10:01:50 2011 -0800

    Move and rename temp[4] definition to reduce confusion with temp[256]
    
    Both variables were locals in different scope levels of the same
    function, leading to both confusing code and gcc -Wshadow warnings:
    
    sm_genid.c: In function 'SmsGenerateClientID':
    sm_genid.c:160:10: warning: declaration of 'temp' shadows a previous local
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 079de6fd4bd0423e20e472d7342f919eebce0517
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 19 09:52:17 2011 -0800

    Use imdent to make multiple levels of nested #if easier to follow
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>