]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tunelp: remove unnecessary preprocessor directives
authorSami Kerola <kerolasa@iki.fi>
Sun, 22 Feb 2015 14:41:36 +0000 (14:41 +0000)
committerKarel Zak <kzak@redhat.com>
Tue, 24 Feb 2015 10:30:51 +0000 (11:30 +0100)
The lp.h included earlier in the tunelp.c has the definitions that were
checked, so these statements could have not been false and such
impossible conditions does not need to be checked.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
sys-utils/tunelp.c

index 197b09359efddea943c8676aeee27a50f462f9ca..8c70268d6e90bf74402e6539acd8b5821a14682a 100644 (file)
@@ -205,7 +205,6 @@ int main(int argc, char **argv)
                                show_irq = 0;
                        }
                        break;
-#ifdef LPGETSTATUS
                case 'o':
                        cmds->op = LPABORTOPEN;
                        cmds->val = get_onoff(optarg);
@@ -228,8 +227,6 @@ int main(int argc, char **argv)
                        cmds = cmds->next;
                        cmds->next = 0;
                        break;
-#endif
-#ifdef LPRESET
                case 'r':
                        cmds->op = LPRESET;
                        cmds->val = 0;
@@ -237,8 +234,6 @@ int main(int argc, char **argv)
                        cmds = cmds->next;
                        cmds->next = 0;
                        break;
-#endif
-#ifdef LPTRUSTIRQ
                case 'T':
                        /* Note: this will do the wrong thing on
                         * 2.0.36 when compiled under 2.2.x
@@ -249,7 +244,6 @@ int main(int argc, char **argv)
                        cmds = cmds->next;
                        cmds->next = 0;
                        break;
-#endif
                case 'v':
                case 'V':
                        printf(UTIL_LINUX_VERSION);
@@ -290,7 +284,6 @@ int main(int argc, char **argv)
 
        cmds = cmdst;
        while (cmds->next) {
-#ifdef LPGETSTATUS
                if (cmds->op == LPGETSTATUS) {
                        status = 0xdeadbeef;
                        retval = ioctl(fd, LPGETSTATUS - offset, &status);
@@ -314,7 +307,6 @@ int main(int argc, char **argv)
                                printf("\n");
                        }
                } else
-#endif /* LPGETSTATUS */
                if (ioctl(fd, cmds->op - offset, cmds->val) < 0)
                        warn(_("ioctl failed"));
                cmdst = cmds;