From owner-svn-ports-all@freebsd.org Thu Jan 19 05:21:24 2017 Return-Path: Delivered-To: svn-ports-all@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 833FFCB7299; Thu, 19 Jan 2017 05:21:24 +0000 (UTC) (envelope-from jbeich@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 34E8E1805; Thu, 19 Jan 2017 05:21:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0J5LNWM040567; Thu, 19 Jan 2017 05:21:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5LN8W040566; Thu, 19 Jan 2017 05:21:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190521.v0J5LN8W040566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431845 - branches/2017Q1/comms/telldus-core/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2017 05:21:24 -0000 Author: jbeich Date: Thu Jan 19 05:21:23 2017 New Revision: 431845 URL: https://svnweb.freebsd.org/changeset/ports/431845 Log: MFH: r431828 comms/telldus-core: unbreak with clang 4.0 service/SettingsConfuse.cpp:47:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ service/SettingsConfuse.cpp:50:17: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->var_cfg > 0) { ~~~~~~~~~~ ^ ~ service/SettingsConfuse.cpp:61:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ service/SettingsConfuse.cpp:73:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ PR: 216052 Submitted by: Johan Ström (maintainer) Approved by: ports-secteam blanket Modified: branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp ============================================================================== --- branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Thu Jan 19 05:18:24 2017 (r431844) +++ branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Thu Jan 19 05:21:23 2017 (r431845) @@ -9,3 +9,34 @@ cfg_t *cfg; cfg_t *var_cfg; }; +@@ -42,10 +44,10 @@ + */ + Settings::~Settings(void) { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + cfg_free(d->cfg); + } +- if (d->var_cfg > 0) { ++ if (d->var_cfg != 0) { + cfg_free(d->var_cfg); + } + delete d; +@@ -56,7 +58,7 @@ + */ + std::wstring Settings::getSetting(const std::wstring &strName) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str())); + return TelldusCore::charToWstring(setting.c_str()); + } +@@ -68,7 +70,7 @@ + */ + int Settings::getNumberOfNodes(Node node) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + if (node == Device) { + return cfg_size(d->cfg, "device"); + } else if (node == Controller) {