Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 12 Feb 2019 07:03:38 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r344044 - in stable: 10/usr.bin/ipcs 11/usr.bin/ipcs 12/usr.bin/ipcs
Message-ID:  <201902120703.x1C73cfn032981@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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/12/usr.bin/ipcs/ipcs.c
Directory Properties:
  stable/12/   (props changed)

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

Modified: stable/12/usr.bin/ipcs/ipcs.c
==============================================================================
--- stable/12/usr.bin/ipcs/ipcs.c	Tue Feb 12 05:15:36 2019	(r344043)
+++ stable/12/usr.bin/ipcs/ipcs.c	Tue Feb 12 07:03:37 2019	(r344044)
@@ -199,7 +199,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);
 
@@ -227,15 +227,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);
@@ -262,15 +257,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;
 
@@ -299,12 +289,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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902120703.x1C73cfn032981>