svn commit: r431845 - branches/2017Q1/comms/telldus-core/files

[Jan Beich]

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) {