From owner-svn-src-stable-9@freebsd.org  Wed May  4 00:35:42 2016
Return-Path: <owner-svn-src-stable-9@freebsd.org>
Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA68DB2BD11;
 Wed,  4 May 2016 00:35:42 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 97D04135B;
 Wed,  4 May 2016 00:35:42 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u440ZfVa050756;
 Wed, 4 May 2016 00:35:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u440ZfWu050755;
 Wed, 4 May 2016 00:35:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605040035.u440ZfWu050755@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 4 May 2016 00:35:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r299023 - stable/9/contrib/bsnmp/gensnmptree
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2016 00:35:42 -0000

Author: ngie
Date: Wed May  4 00:35:41 2016
New Revision: 299023
URL: https://svnweb.freebsd.org/changeset/base/299023

Log:
  MFstable/10 r299022:
  
  MFC r298450:
  
  Simplify always evaluated branch (`e != NULL`)
  
  - xalloc(..) ensures that e will be non-null via malloc + err.
  - `e` is already dereferenced above, so logically it's impossible
    to hit the lower test without crashing if it was indeed NULL.
  
  CID: 1007408

Modified:
  stable/9/contrib/bsnmp/gensnmptree/gensnmptree.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/   (props changed)
  stable/9/contrib/bsnmp/   (props changed)

Modified: stable/9/contrib/bsnmp/gensnmptree/gensnmptree.c
==============================================================================
--- stable/9/contrib/bsnmp/gensnmptree/gensnmptree.c	Wed May  4 00:34:45 2016	(r299022)
+++ stable/9/contrib/bsnmp/gensnmptree/gensnmptree.c	Wed May  4 00:35:41 2016	(r299023)
@@ -743,10 +743,8 @@ parse_type(enum tok *tok, struct type *t
 				report("need value for ENUM/BITS");
 			if (gettoken() != TOK_STR)
 				report("need string in ENUM/BITS");
-			if (e != NULL) {
-				e->name = savetok();
-				TAILQ_INSERT_TAIL(&t->enums, e, link);
-			}
+			e->name = savetok();
+			TAILQ_INSERT_TAIL(&t->enums, e, link);
 			if ((*tok = gettoken()) == TOK_EOF)
 				report("unexpected EOF in ENUM/BITS");
 		} while (*tok != ')');