svn commit: r344044 - in stable: 10/usr.bin/ipcs 11/usr.bin/ipcs 12/usr.bin/ipcs

[Andriy Voskoboinyk]

Author: avos
Date: Tue Feb 12 07:03:37 2019
New Revision: 344044
URL: https://svnweb.freebsd.org/changeset/base/344044

Log:
  MFC r343870:
  ipcs(1): drop obsolete error checking
  
  This code is unreachable since r77551.
  
  PR:           201728

Modified:
  stable/10/usr.bin/ipcs/ipcs.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.bin/ipcs/ipcs.c
  stable/12/usr.bin/ipcs/ipcs.c
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/usr.bin/ipcs/ipcs.c
==============================================================================
--- stable/10/usr.bin/ipcs/ipcs.c       Tue Feb 12 05:15:36 2019        
(r344043)
+++ stable/10/usr.bin/ipcs/ipcs.c       Tue Feb 12 07:03:37 2019        
(r344044)
@@ -195,7 +195,7 @@ main(int argc, char *argv[])
        }
 
        kget(X_MSGINFO, &msginfo, sizeof(msginfo));
-       if ((display & (MSGINFO | MSGTOTAL))) {
+       if (display & (MSGINFO | MSGTOTAL)) {
                if (display & MSGTOTAL)
                        print_kmsqtotal(msginfo);
 
@@ -223,15 +223,10 @@ main(int argc, char *argv[])
 
                        printf("\n");
                }
-       } else
-               if (display & (MSGINFO | MSGTOTAL)) {
-                       fprintf(stderr,
-                           "SVID messages facility "
-                           "not configured in the system\n");
-               }
+       }
 
        kget(X_SHMINFO, &shminfo, sizeof(shminfo));
-       if ((display & (SHMINFO | SHMTOTAL))) {
+       if (display & (SHMINFO | SHMTOTAL)) {
 
                if (display & SHMTOTAL)
                        print_kshmtotal(shminfo);
@@ -258,15 +253,10 @@ main(int argc, char *argv[])
                        }
                        printf("\n");
                }
-       } else
-               if (display & (SHMINFO | SHMTOTAL)) {
-                       fprintf(stderr,
-                           "SVID shared memory facility "
-                           "not configured in the system\n");
-               }
+       }
 
        kget(X_SEMINFO, &seminfo, sizeof(seminfo));
-       if ((display & (SEMINFO | SEMTOTAL))) {
+       if (display & (SEMINFO | SEMTOTAL)) {
                struct semid_kernel *kxsema;
                size_t kxsema_len;
 
@@ -295,12 +285,7 @@ main(int argc, char *argv[])
 
                        printf("\n");
                }
-       } else
-               if (display & (SEMINFO | SEMTOTAL)) {
-                       fprintf(stderr,
-                           "SVID semaphores facility "
-                           "not configured in the system\n");
-               }
+       }
 
        if (!use_sysctl)
                kvm_close(kd);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"