Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 5 Feb 2017 18:57:59 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433443 - in head/comms/linpsk: . files
Message-ID:  <201702051857.v15Ivxwe022196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Sun Feb  5 18:57:59 2017
New Revision: 433443
URL: https://svnweb.freebsd.org/changeset/ports/433443

Log:
  comms/linpsk: unbreak with clang 4.0
  
  crxdisplay.cpp:101:16: error: ordered comparison between pointer and zero ('Input *' and 'int')
      if ( Sound <= NULL )
           ~~~~~ ^  ~~~~
  
  PR:		216234
  Submitted by:	tcberner
  Approved by:	maintainer timeout (2 weeks)

Added:
  head/comms/linpsk/files/patch-gui_crxdisplay.cpp   (contents, props changed)
  head/comms/linpsk/files/patch-gui_linpsk.cpp   (contents, props changed)
Modified:
  head/comms/linpsk/Makefile   (contents, props changed)

Modified: head/comms/linpsk/Makefile
==============================================================================
--- head/comms/linpsk/Makefile	Sun Feb  5 18:57:52 2017	(r433442)
+++ head/comms/linpsk/Makefile	Sun Feb  5 18:57:59 2017	(r433443)
@@ -2,6 +2,7 @@
 
 PORTNAME=	linpsk
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 

Added: head/comms/linpsk/files/patch-gui_crxdisplay.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/linpsk/files/patch-gui_crxdisplay.cpp	Sun Feb  5 18:57:59 2017	(r433443)
@@ -0,0 +1,13 @@
+Fix bogus pointer comparison.
+
+--- gui/crxdisplay.cpp.orig	2017-01-22 12:03:47 UTC
++++ gui/crxdisplay.cpp
+@@ -98,7 +98,7 @@ bool CRxDisplay::start_process_loop()
+     }
+     else
+       Sound = new CSound ( settings.serial );
+-    if ( Sound <= NULL )
++    if ( !Sound )
+       return false;
+ 
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) );

Added: head/comms/linpsk/files/patch-gui_linpsk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/linpsk/files/patch-gui_linpsk.cpp	Sun Feb  5 18:57:59 2017	(r433443)
@@ -0,0 +1,22 @@
+Fix bogus pointer comparison.
+
+--- gui/linpsk.cpp.orig	2017-01-22 12:03:55 UTC
++++ gui/linpsk.cpp
+@@ -387,7 +387,7 @@ void LinPSK::startTx()
+       Info = "BPSK";
+       break;
+   }
+-  if ( Sound <= NULL ) // Only create Sound Device once for output
++  if ( !Sound ) // Only create Sound Device once for output
+   {
+     if ( settings.DemoMode )
+     {
+@@ -401,7 +401,7 @@ void LinPSK::startTx()
+       Sound = new CSound ( settings.serial );
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) );
+   }
+-  if ( Sound <= NULL )
++  if ( !Sound )
+   {
+     QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" );
+     TxDisplay->TxFunctions->setStatus ( ON );

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702051857.v15Ivxwe022196>