Attachment 180595 Details for Bug 216199 – possible-patch

[patch] possible-patch

svn-diff_comms_fldigi (text/plain), 12.82 KB, created by Walter Schwarzenfeld on 2017-03-07 10:23:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-03-07 10:23:45 UTC

Size: 12.82 KB

patch

obsolete

>Index: files/patch-adif__io.cxx
>===================================================================
>--- files/patch-adif__io.cxx	(nonexistent)
>+++ files/patch-adif__io.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/logbook/adif_io.cxx.orig	2017-03-07 02:41:27 UTC
>++++ src/logbook/adif_io.cxx
>+@@ -311,7 +311,7 @@ void cAdifIO::do_readfile(const char *fn
>+ 			} else {
>+ 				ptr2 = ptr + 1;
>+ 			}
>+-			if ((ptr2) > 0 && (unsigned)(ptr2 - ptr) <= p)
>++			if ((ptr2) != NULL  && (unsigned)(ptr2 - ptr) <= p)
>+ 				ptr = strchr(ptr2,'<');
>+ 			else
>+ 				break; // corrupt record
>
>Property changes on: files/patch-adif__io.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-confdialog.cxx
>===================================================================
>--- files/patch-confdialog.cxx	(nonexistent)
>+++ files/patch-confdialog.cxx	(working copy)
>@@ -0,0 +1,47 @@
>+--- src/dialogs/confdialog.cxx.orig	2017-03-07 05:12:21 UTC
>++++ src/dialogs/confdialog.cxx
>+@@ -577,7 +577,7 @@ Fl_Button *bVisibleModes=(Fl_Button *)0;
>+ static void cb_bVisibleModes(Fl_Button* o, void*) {
>+   mode_browser->label(o->label());
>+ mode_browser->callback(toggle_visible_modes);
>+-mode_browser->show(&progdefaults.visible_modes);
>++mode_browser->show_(&progdefaults.visible_modes);
>+ progdefaults.changed = true;
>+ }
>+ 
>+@@ -5485,7 +5485,7 @@ Fl_Button *bRSIDRxModes=(Fl_Button *)0;
>+ static void cb_bRSIDRxModes(Fl_Button* o, void*) {
>+   mode_browser->label(o->label());
>+ mode_browser->callback(0);
>+-mode_browser->show(&progdefaults.rsid_rx_modes);
>++mode_browser->show_(&progdefaults.rsid_rx_modes);
>+ progdefaults.changed = true;
>+ }
>+ 
>+@@ -5558,7 +5558,7 @@ Fl_Button *bRSIDTxModes=(Fl_Button *)0;
>+ static void cb_bRSIDTxModes(Fl_Button* o, void*) {
>+   mode_browser->label(o->label());
>+ mode_browser->callback(0);
>+-mode_browser->show(&progdefaults.rsid_tx_modes);
>++mode_browser->show_(&progdefaults.rsid_tx_modes);
>+ progdefaults.changed = true;
>+ }
>+ 
>+@@ -5625,7 +5625,7 @@ Fl_Button *bVideoIDModes=(Fl_Button *)0;
>+ static void cb_bVideoIDModes(Fl_Button* o, void*) {
>+   mode_browser->label(o->label());
>+ mode_browser->callback(0);
>+-mode_browser->show(&progdefaults.videoid_modes);
>++mode_browser->show_(&progdefaults.videoid_modes);
>+ progdefaults.changed = true;
>+ }
>+ 
>+@@ -5652,7 +5652,7 @@ Fl_Button *bCWIDModes=(Fl_Button *)0;
>+ static void cb_bCWIDModes(Fl_Button* o, void*) {
>+   mode_browser->label(o->label());
>+ mode_browser->callback(0);
>+-mode_browser->show(&progdefaults.cwid_modes);
>++mode_browser->show_(&progdefaults.cwid_modes);
>+ progdefaults.changed = true;
>+ }
>+ 
>
>Property changes on: files/patch-confdialog.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-flmisc.cxx
>===================================================================
>--- files/patch-flmisc.cxx	(nonexistent)
>+++ files/patch-flmisc.cxx	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/widgets/flmisc.cxx.orig	2017-03-07 02:58:03 UTC
>++++ src/widgets/flmisc.cxx
>+@@ -104,7 +104,7 @@ void adjust_color_inv(unsigned char& bg1
>+ 	bg1r = 255 - bg1r; bg1g = 255 - bg1g; bg1b = 255 - bg1b;
>+ 	Fl_Color adj = fl_rgb_color(bg1r, bg1g, bg1b);
>+ 	if (fl_contrast(adj, bg2) != adj)
>+-		Fl::get_color((def >= 0 ? def : adj), bg1r, bg1g, bg1b);
>++		Fl::get_color((def >= 1 ? def : adj), bg1r, bg1g, bg1b);
>+ }
>+ 
>+ #if !defined(__APPLE__) && !defined(__WOE32__) && USE_X
>+@@ -287,7 +287,7 @@ Mode_Browser::~Mode_Browser(void)
>+ 	delete modes;
>+ }
>+ 
>+-void Mode_Browser::show(mode_set_t* b)
>++void Mode_Browser::show_(mode_set_t* b)
>+ {
>+ 	store = b;
>+ 	modes->check_none();
>
>Property changes on: files/patch-flmisc.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-flmisc.h
>===================================================================
>--- files/patch-flmisc.h	(nonexistent)
>+++ files/patch-flmisc.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/include/flmisc.h.orig	2017-03-07 04:58:14 UTC
>++++ src/include/flmisc.h
>+@@ -87,7 +87,7 @@ public:
>+ 	Mode_Browser(void);
>+ 	~Mode_Browser(void);
>+ 
>+-	void show(mode_set_t* b);
>++	void show_(mode_set_t* b);
>+ 	void callback(Fl_Callback* cb, void* args = 0);
>+ private:
>+ 	Fl_Button *close_button, *all_button, *none_button;
>
>Property changes on: files/patch-flmisc.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-lookupcall.cxx
>===================================================================
>--- files/patch-lookupcall.cxx	(nonexistent)
>+++ files/patch-lookupcall.cxx	(working copy)
>@@ -0,0 +1,36 @@
>+--- src/logbook/lookupcall.cxx.orig	2017-03-07 06:03:15 UTC
>++++ src/logbook/lookupcall.cxx
>+@@ -726,28 +726,28 @@ void parse_html(const string& htmlpage)
>+ 
>+ 	clear_Lookup();
>+ 
>+-	if ((p = htmlpage.find(HAMCALL_FIRST)) != string::npos) {
>++	if ((p = htmlpage.find(to_string(HAMCALL_FIRST))) != string::npos) {
>+ 		p++;
>+ 		while ((uchar)htmlpage[p] < 128 && p < htmlpage.length() )
>+ 			lookup_fname += htmlpage[p++];
>+ 		camel_case(lookup_fname);
>+ 	}
>+-	if ((p = htmlpage.find(HAMCALL_CITY)) != string::npos) {
>++	if ((p = htmlpage.find(to_string(HAMCALL_CITY))) != string::npos) {
>+ 		p++;
>+ 		while ((uchar)htmlpage[p] < 128 && p < htmlpage.length())
>+ 			lookup_qth += htmlpage[p++];
>+ 	}
>+-	if ((p = htmlpage.find(HAMCALL_STATE)) != string::npos) {
>++	if ((p = htmlpage.find(to_string(HAMCALL_STATE))) != string::npos) {
>+ 		p++;
>+ 		while ((uchar)htmlpage[p] < 128 && p < htmlpage.length())
>+ 			lookup_state += htmlpage[p++];
>+ 	}
>+-	if ((p = htmlpage.find(HAMCALL_GRID)) != string::npos) {
>++	if ((p = htmlpage.find(to_string(HAMCALL_GRID))) != string::npos) {
>+ 		p++;
>+ 		while ((uchar)htmlpage[p] < 128 && p < htmlpage.length())
>+ 			lookup_grid += htmlpage[p++];
>+ 	}
>+-	if ((p = htmlpage.find(HAMCALL_DOB)) != string::npos) {
>++	if ((p = htmlpage.find(to_string(HAMCALL_DOB))) != string::npos) {
>+ 		p++;
>+ 		lookup_notes = "DOB: ";
>+ 		while ((uchar)htmlpage[p] < 128 && p < htmlpage.length())
>
>Property changes on: files/patch-lookupcall.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-psk.cxx
>===================================================================
>--- files/patch-psk.cxx	(nonexistent)
>+++ files/patch-psk.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/psk/psk.cxx.orig	2017-03-07 05:08:33 UTC
>++++ src/psk/psk.cxx
>+@@ -1095,7 +1095,7 @@ void psk::findsignal()
>+ 			}
>+ 			if (evalpsk->sigpeak(ftest, f1, f2) > pow(10, progdefaults.ServerACQsn / 10) ) {
>+ 				if (progdefaults.PSKmailSweetSpot) {
>+-					if (fabs(ftest - progdefaults.ServerCarrier) < progdefaults.ServerOffset) {
>++					if (abs(ftest - progdefaults.ServerCarrier) < progdefaults.ServerOffset) {
>+ 						frequency = ftest;
>+ 						set_freq(frequency);
>+ 						freqerr = 0.0;
>
>Property changes on: files/patch-psk.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-socket.cxx
>===================================================================
>--- files/patch-socket.cxx	(nonexistent)
>+++ files/patch-socket.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/misc/socket.cxx.orig	2017-03-07 03:03:35 UTC
>++++ src/misc/socket.cxx
>+@@ -608,7 +608,7 @@ void Socket::open(const Address& addr)
>+ 	size_t n = address.size();
>+ 
>+ //	for (anum = 0; anum < n; anum++) {
>+-	for (anum = n-1; anum >= 0; anum--) {
>++	for (anum = n-1; anum >= 1; anum--) {
>+ 		ainfo = address.get(anum);
>+ 		LOG_INFO("Trying %s", address.get_str(ainfo).c_str());
>+ 		if ((sockfd = socket(ainfo->ai_family, ainfo->ai_socktype, ainfo->ai_protocol)) != -1)
>
>Property changes on: files/patch-socket.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-sound.cxx
>===================================================================
>--- files/patch-sound.cxx	(nonexistent)
>+++ files/patch-sound.cxx	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/soundcard/sound.cxx.orig	2017-03-07 03:25:56 UTC
>++++ src/soundcard/sound.cxx
>+@@ -766,7 +766,7 @@ size_t SoundOSS::Read(float *buffer, siz
>+ 
>+ 	for (size_t i = 0; i < buffersize; i++)
>+ 		buffer[i] = src_buffer[2*i + 
>+-							   progdefaults.ReverseRxAudio ? 1 : 0];
>++							   (progdefaults.ReverseRxAudio ? 1 : 0)];
>+ 
>+ #if USE_SNDFILE
>+ 	if (capture)
>+@@ -801,7 +801,7 @@ size_t SoundOSS::Read(float *buffer, siz
>+ 
>+ 	for (int i = 0; i < numread; i++)
>+ 		buffer[i] = snd_buffer[2*i +
>+-							   progdefaults.sig_on_right_channel ? 1 : 0];
>++							   (progdefaults.sig_on_right_channel ? 1 : 0)];
>+ 
>+ 	return numread;
>+ 
>
>Property changes on: files/patch-sound.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-synop.cxx
>===================================================================
>--- files/patch-synop.cxx	(nonexistent)
>+++ files/patch-synop.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/synop-src/synop.cxx.orig	2017-03-07 05:04:13 UTC
>++++ src/synop-src/synop.cxx
>+@@ -106,7 +106,7 @@ static int diffTm( time_t tim1, time_t t
>+ 	if( (tim1 <= 0 ) || (tim2 <= 0 ) ) throw std::runtime_error("Invalid times");
>+ 
>+ 	double nbSecs = difftime( tim1, tim2 );
>+-	return abs( 0.5 + nbSecs * ( 1.0 / ( 24 * 3600 ) ) );
>++	return fabs( 0.5 + nbSecs * ( 1.0 / ( 24 * 3600 ) ) );
>+ }
>+ 
>+ /// We could use any other time as long as it is clear.
>
>Property changes on: files/patch-synop.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-xmlrpc.cxx
>===================================================================
>--- files/patch-xmlrpc.cxx	(nonexistent)
>+++ files/patch-xmlrpc.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/misc/xmlrpc.cxx.orig	2017-03-07 03:11:50 UTC
>++++ src/misc/xmlrpc.cxx
>+@@ -44,7 +44,7 @@
>+ 
>+ #include "threads.h"
>+ 
>+-class XmlRpcImpl;
>++struct XmlRpcImpl;
>+ 
>+ #include "globals.h"
>+ #include "configuration.h"
>
>Property changes on: files/patch-xmlrpc.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-xmlrpc.h
>===================================================================
>--- files/patch-xmlrpc.h	(nonexistent)
>+++ files/patch-xmlrpc.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/include/xmlrpc.h.orig	2017-03-07 03:19:13 UTC
>++++ src/include/xmlrpc.h
>+@@ -30,7 +30,7 @@
>+ 
>+ #include "threads.h"
>+ 
>+-class XmlRpcImpl;
>++struct XmlRpcImpl;
>+ 
>+ class XML_RPC_Server
>+ {
>
>Property changes on: files/patch-xmlrpc.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216199: 180595