From owner-svn-src-head@freebsd.org  Mon Feb 27 00:10:02 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 415CECEEC1E;
 Mon, 27 Feb 2017 00:10:02 +0000 (UTC) (envelope-from pfg@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 1115F8BB;
 Mon, 27 Feb 2017 00:10:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R0A1wO074124;
 Mon, 27 Feb 2017 00:10:01 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R0A1wm074123;
 Mon, 27 Feb 2017 00:10:01 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201702270010.v1R0A1wm074123@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Feb 2017 00:10:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314322 - head/lib/librss
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Feb 2017 00:10:02 -0000

Author: pfg
Date: Mon Feb 27 00:10:00 2017
New Revision: 314322
URL: https://svnweb.freebsd.org/changeset/base/314322

Log:
  librss: simplify some NULL checks.
  
  MFC after:	1 week

Modified:
  head/lib/librss/librss.c

Modified: head/lib/librss/librss.c
==============================================================================
--- head/lib/librss/librss.c	Sun Feb 26 22:17:06 2017	(r314321)
+++ head/lib/librss/librss.c	Mon Feb 27 00:10:00 2017	(r314322)
@@ -244,10 +244,10 @@ rss_config_get(void)
 	return (rc);
 
 error:
-	if ((rc != NULL) && rc->rss_bucket_map)
+	if (rc != NULL) {
 		free(rc->rss_bucket_map);
-	if (rc != NULL)
 		free(rc);
+	}
 	return (NULL);
 }