View | Details | Raw Unified | Return to bug 216199
Collapse All | Expand All

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

Return to bug 216199