diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-04-14 18:12:18 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-04-14 18:12:18 +0300 |
| commit | a4bbf08f4d365f2d5ff746917cb8cfa66c1d3c51 (patch) | |
| tree | f52d31540e9a20ae1a4a79ff9046e408fe55adac | |
| parent | 7401ab6a7b0de775e16b371a1c98989cd3eb2cd5 (diff) | |
| download | rpm-a4bbf08f4d365f2d5ff746917cb8cfa66c1d3c51.tar.gz rpm-a4bbf08f4d365f2d5ff746917cb8cfa66c1d3c51.tar.bz2 rpm-a4bbf08f4d365f2d5ff746917cb8cfa66c1d3c51.zip | |
Lose useless variable
| -rw-r--r-- | lib/psm.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -830,9 +830,8 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp, /* XXX filter order dependent multilib "other" arch helper error. */ if (!(psm->sq.reaped >= 0 && !strcmp(*argvp[0], "/usr/sbin/glibc_post_upgrade") && WEXITSTATUS(psm->sq.status) == 110)) { - void *ptr = NULL; if (psm->sq.reaped < 0) { - ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, + (void) rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, stag, WTERMSIG(psm->sq.child)); rpmlog(RPMLOG_ERR, _("%s scriptlet failed, waitpid(%d) rc %d: %s\n"), sname, psm->sq.child, psm->sq.reaped, strerror(errno)); @@ -840,12 +839,12 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp, } else if (!WIFEXITED(psm->sq.status) || WEXITSTATUS(psm->sq.status)) { if (WIFSIGNALED(psm->sq.status)) { - ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, + (void)rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, stag, WTERMSIG(psm->sq.status)); rpmlog(RPMLOG_ERR, _("%s scriptlet failed, signal %d\n"), sname, WTERMSIG(psm->sq.status)); } else { - ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, + (void) rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, stag, WEXITSTATUS(psm->sq.status)); rpmlog(RPMLOG_ERR, _("%s scriptlet failed, exit status %d\n"), sname, WEXITSTATUS(psm->sq.status)); |