]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
lib/port.c: getttyuser(): Remove dead code
authorAlejandro Colomar <alx@kernel.org>
Tue, 2 Jul 2024 12:03:27 +0000 (14:03 +0200)
committerSerge Hallyn <serge@hallyn.com>
Sat, 6 Jul 2024 12:44:02 +0000 (07:44 -0500)
port.pt_names cannot be NULL; it always points to the static array ttys.

$ grep -rn pt_names
lib/port.c:157: port.pt_names = ttys;
lib/port.c:159: port.pt_names[j] = cp;
lib/port.c:172: port.pt_names[j] = NULL;
lib/port.c:344: for (i = 0; NULL != port->pt_names[i]; i++) {
lib/port.c:345: if (portcmp (port->pt_names[i], tty) == 0) {
lib/port.c:350: if (port->pt_names[i] == 0) {
lib/port.h:39: * pt_names - pointer to array of device names in /dev/
lib/port.h:45: char **pt_names;

Signed-off-by: Alejandro Colomar <alx@kernel.org>
lib/port.c

index 03543d5d6a76e77351f74a0a0eba9ea73856ad84..14ab06c966d8d7fcc4495cdaed4f43c0400159a2 100644 (file)
@@ -338,10 +338,8 @@ static struct port *getttyuser (const char *tty, const char *user)
        setportent ();
 
        while ((port = getportent ()) != NULL) {
-               if (   (0 == port->pt_names)
-                   || (0 == port->pt_users)) {
+               if (NULL == port->pt_users)
                        continue;
-               }
 
                for (i = 0; NULL != port->pt_names[i]; i++) {
                        if (portcmp (port->pt_names[i], tty) == 0) {