diff --git a/ChangeLog b/ChangeLog index 4a1725c68..b2e213122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-02 Adam Jackson + + * os/xdmauth.c: + Coverity #82: Dead variable elimination. + 2006-04-02 Adam Jackson * GL/glx/glxcmdsswap.c: diff --git a/os/xdmauth.c b/os/xdmauth.c index 0d7691e13..774298133 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -463,10 +463,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap) int XdmRemoveCookie (unsigned short data_length, char *data) { - XdmAuthorizationPtr auth, prev; + XdmAuthorizationPtr auth; XdmAuthKeyPtr key_bits, rho_bits; - prev = 0; switch (data_length) { case 16: @@ -486,10 +485,7 @@ XdmRemoveCookie (unsigned short data_length, char *data) if (XdmcpCompareKeys (rho_bits, &auth->rho) && XdmcpCompareKeys (key_bits, &auth->key)) { - if (prev) - prev->next = auth->next; - else - xdmAuth = auth->next; + xdmAuth = auth->next; xfree (auth); return 1; }