svn commit: r260195 - stable/10/bin/ps

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Jan  2 13:59:23 2014
New Revision: 260195
URL: http://svnweb.freebsd.org/changeset/base/260195

Log:
  MFC r256838:
  
  Don't test arrays for being NULL.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/bin/ps/print.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/ps/print.c
==============================================================================
--- stable/10/bin/ps/print.c	Thu Jan  2 13:53:53 2014	(r260194)
+++ stable/10/bin/ps/print.c	Thu Jan  2 13:59:23 2014	(r260195)
@@ -797,8 +797,6 @@ char *
 emulname(KINFO *k, VARENT *ve __unused)
 {
 
-	if (k->ki_p->ki_emul == NULL)
-		return (NULL);
 	return (strdup(k->ki_p->ki_emul));
 }
 
@@ -827,7 +825,6 @@ out:
 char *
 loginclass(KINFO *k, VARENT *ve __unused)
 {
-	char *s;
 
 	/*
 	 * Don't display login class for system processes;
@@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused
 	if (k->ki_p->ki_flag & P_SYSTEM) {
 		return (strdup("-"));
 	}
-	s = k->ki_p->ki_loginclass;
-	if (s == NULL)
-		return (NULL);
-	return (strdup(s));
+	return (strdup(k->ki_p->ki_loginclass));
 }