Extraneous test in setsignal()?

void setsignal(int signo)
{
...
        if ((t = trap[signo]) == NULL)
                action = S_DFL;
        else if (*t != '\0')
                action = S_CATCH;
        else
                action = S_IGN;
        if (rootshell && action == S_DFL && !lvforked) {
...

If you read the above carefully, you see that action == S_DFL check
can be eliminated if we rewrite the above like this:

        new_act = S_DFL;
        if ((t = trap[signo]) != NULL)
                new_act = S_CATCH;
                if (t[0] == '\0')
                        new_act = S_IGN;
        } else if (rootshell && !lvforked) {
...