Fix compile warnings found when adding -Wall and others.

Author: wb2osz

aclients.c

@@ -59,8 +59,6 @@
 #include <ws2tcpip.h>  		// _WIN32_WINNT must be set to 0x0501 before including this
 
 #else 
-//#define __USE_XOPEN2KXSI 1
-//#define __USE_XOPEN 1
 #include <stdlib.h>
 #include <netdb.h>
 #include <sys/types.h>
@@ -466,7 +464,11 @@ static void * client_thread_net (void *arg)
 	// Try each address until we find one that is successful.
 
 	for (n=0; n<num_hosts; n++) {
+#if __WIN32__
+	  SOCKET is;
+#else
 	  int is;
+#endif
 
 	  ai = hosts[n];
 
@@ -576,7 +578,7 @@ static void * client_thread_net (void *arg)
 	  printf ("client %d received '%c' data, data_len = %d\n", 
 			my_index, mon_cmd.kind_lo, mon_cmd.data_len);
 #endif
-	  assert (mon_cmd.data_len >= 0 && mon_cmd.data_len < sizeof(data));
+	  assert (mon_cmd.data_len >= 0 && mon_cmd.data_len < (int)(sizeof(data)));
 
 	  if (mon_cmd.data_len > 0) {
 #if __WIN32__

aprs_tt.c

@@ -1447,7 +1447,7 @@ static int find_ttloc_match (char *e, char *xstr, char *ystr, char *zstr, char *
 
 	  len = strlen(tt_config.ttloc_ptr[ipat].pattern);
 
-	  if (strlen(e) == len) {
+	  if ((int)(strlen(e)) == len) {
 
 	    match = 1;
 	    strlcpy (xstr, "", valstrsize);

audio.c

@@ -375,8 +375,8 @@ int audio_open (struct audio_s *pa)
 
 	        {
 	          struct sockaddr_in si_me;
-	          int slen=sizeof(si_me);
-	          int data_size = 0;
+	          //int slen=sizeof(si_me);
+	          //int data_size = 0;
 
 	          //Create UDP Socket
 	          if ((adev[a].udp_sock=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP))==-1) {
@@ -1003,7 +1003,7 @@ int audio_get (int a)
 	  case AUDIO_IN_TYPE_SDR_UDP:
 
 	    while (adev[a].inbuf_next >= adev[a].inbuf_len) {
-	      int ch, res,i;
+	      int res;
 
               assert (adev[a].udp_sock > 0);
 	      res = recv(adev[a].udp_sock, adev[a].inbuf_ptr, adev[a].inbuf_size_in_bytes, 0);
@@ -1038,7 +1038,8 @@ int audio_get (int a)
 	  case AUDIO_IN_TYPE_STDIN:
 
 	    while (adev[a].inbuf_next >= adev[a].inbuf_len) {
-	      int ch, res,i;
+	      //int ch, res,i;
+	      int res;
 
 	      res = read(STDIN_FILENO, adev[a].inbuf_ptr, (size_t)adev[a].inbuf_size_in_bytes);
 	      if (res <= 0) {

audio_win.c

@@ -287,7 +287,7 @@ int audio_open (struct audio_s *pa)
 
 	    A->udp_sock = INVALID_SOCKET;
 
-	    in_dev_no[a] = WAVE_MAPPER;	/* = -1 */
+	    in_dev_no[a] = WAVE_MAPPER;	/* = ((UINT)-1) in mmsystem.h */
 	    out_dev_no[a] = WAVE_MAPPER;
 
 /*
@@ -320,16 +320,16 @@ int audio_open (struct audio_s *pa)
 
 	      /* Otherwise, does it have search string? */
 
-	      if (in_dev_no[a] == WAVE_MAPPER && strlen(pa->adev[a].adevice_in) >= 1) {
+	      if ((UINT)(in_dev_no[a]) == WAVE_MAPPER && strlen(pa->adev[a].adevice_in) >= 1) {
 	        num_devices = waveInGetNumDevs();
-	        for (n=0 ; n<num_devices && in_dev_no[a] == WAVE_MAPPER ; n++) {
+	        for (n=0 ; n<num_devices && (UINT)(in_dev_no[a]) == WAVE_MAPPER ; n++) {
 	          if ( ! waveInGetDevCaps(n, &wic, sizeof(WAVEINCAPS))) {
 	            if (strstr(wic.szPname, pa->adev[a].adevice_in) != NULL) {
 	              in_dev_no[a] = n;
 	            }
 	          }
 	        }
-	        if (in_dev_no[a] == WAVE_MAPPER) {
+	        if ((UINT)(in_dev_no[a]) == WAVE_MAPPER) {
 	          text_color_set(DW_COLOR_ERROR);
 	          dw_printf ("\"%s\" doesn't match any of the input devices.\n", pa->adev[a].adevice_in);
 	        }
@@ -345,16 +345,16 @@ int audio_open (struct audio_s *pa)
 	      out_dev_no[a] = atoi(pa->adev[a].adevice_out);
 	    }
 
-	    if (out_dev_no[a] == WAVE_MAPPER && strlen(pa->adev[a].adevice_out) >= 1) {
+	    if ((UINT)(out_dev_no[a]) == WAVE_MAPPER && strlen(pa->adev[a].adevice_out) >= 1) {
 	      num_devices = waveOutGetNumDevs();
-	      for (n=0 ; n<num_devices && out_dev_no[a] == WAVE_MAPPER ; n++) {
+	      for (n=0 ; n<num_devices && (UINT)(out_dev_no[a]) == WAVE_MAPPER ; n++) {
 	        if ( ! waveOutGetDevCaps(n, &woc, sizeof(WAVEOUTCAPS))) {
 	          if (strstr(woc.szPname, pa->adev[a].adevice_out) != NULL) {
 	            out_dev_no[a] = n;
 	          }
 	        }
 	      }
-	      if (out_dev_no[a] == WAVE_MAPPER) {
+	      if ((UINT)(out_dev_no[a]) == WAVE_MAPPER) {
 	        text_color_set(DW_COLOR_ERROR);
 	        dw_printf ("\"%s\" doesn't match any of the output devices.\n", pa->adev[a].adevice_out);
 	      }
@@ -799,7 +799,7 @@ int audio_get (int a)
 
 	      p = (WAVEHDR*)(A->in_headp);		/* no need to be volatile at this point */
 
-	      if (p->dwUser == -1) {
+	      if (p->dwUser == (DWORD)(-1)) {
 	        waveInUnprepareHeader(A->audio_in_handle, p, sizeof(WAVEHDR));
 	        p->dwUser = 0;	/* Index for next byte. */
 
@@ -960,11 +960,11 @@ int audio_put (int a, int c)
 	/* Should never be full at this point. */
 
 	assert (p->dwBufferLength >= 0);
-	assert (p->dwBufferLength < A->outbuf_size);
+	assert (p->dwBufferLength < (DWORD)(A->outbuf_size));
 
 	p->lpData[p->dwBufferLength++] = c;
 
-	if (p->dwBufferLength == A->outbuf_size) {
+	if (p->dwBufferLength == (DWORD)(A->outbuf_size)) {
 	  return (audio_flush(a));
 	}
 

ax25_link.c

@@ -1193,7 +1193,7 @@ void dl_data_request (dlq_item_t *E)
 	first_segment.original_pid = E->txdata->pid;
 	seglen = MIN(S->n1_paclen - 2, remaining_len);
 
-	if (seglen < 1 || seglen > S->n1_paclen - 2 || seglen > remaining_len || seglen > sizeof (first_segment.segdata)) {
+	if (seglen < 1 || seglen > S->n1_paclen - 2 || seglen > remaining_len || seglen > (int)(sizeof(first_segment.segdata))) {
 	  text_color_set(DW_COLOR_ERROR);
 	  dw_printf ("INTERNAL ERROR, Segmentation line %d, data length = %d, N1 = %d, segment length = %d, number to follow = %d\n",
 					__LINE__, E->txdata->len, S->n1_paclen, seglen, nseg_to_follow);
@@ -1225,7 +1225,7 @@ void dl_data_request (dlq_item_t *E)
 	  subsequent_segment.header = nseg_to_follow;
 	  seglen = MIN(S->n1_paclen - 1, remaining_len);
 
-	  if (seglen < 1 || seglen > S->n1_paclen - 1 || seglen > remaining_len || seglen > sizeof (subsequent_segment.segdata)) {
+	  if (seglen < 1 || seglen > S->n1_paclen - 1 || seglen > remaining_len || seglen > (int)(sizeof(subsequent_segment.segdata))) {
 	    text_color_set(DW_COLOR_ERROR);
 	    dw_printf ("INTERNAL ERROR, Segmentation line %d, data length = %d, N1 = %d, segment length = %d, number to follow = %d\n",
 					__LINE__, E->txdata->len, S->n1_paclen, seglen, nseg_to_follow);
@@ -1928,7 +1928,7 @@ void lm_data_indication (dlq_item_t *E)
 
 // Gather statistics useful for testing.
 
-	if (ftype >= 0 && ftype <= frame_not_AX25) {
+	if (ftype <= frame_not_AX25) {
 	  S->count_recv_frame_type[ftype]++;
 	}
 
@@ -6083,7 +6083,7 @@ static void negotiation_response (ax25_dlsm_t *S, struct xid_param_s *param)
 // Other end might want 8.
 // Seems unlikely.  If it implements XID it should have modulo 128.
 
-	if (param->modulo == G_UNKNOWN) {
+	if (param->modulo == modulo_unknown) {
 	  param->modulo = 8;			// Not specified.  Set default.
 	}
 	else {
@@ -6094,7 +6094,7 @@ static void negotiation_response (ax25_dlsm_t *S, struct xid_param_s *param)
 // Erratum:  2006 version, section, 4.3.3.7 says default selective reject - reject.
 // We can't do that.
 
-	if (param->rej == G_UNKNOWN) {
+	if (param->rej == unknown_reject) {
 	  param->rej = (param->modulo == 128) ? selective_reject : implicit_reject;	// not specified, set default
 	}
 	else {
@@ -6166,11 +6166,11 @@ static void negotiation_response (ax25_dlsm_t *S, struct xid_param_s *param)
 
 static void complete_negotiation (ax25_dlsm_t *S, struct xid_param_s *param)
 {
-	if (param->rej != G_UNKNOWN) {
+	if (param->rej != unknown_reject) {
 	  S->srej_enabled = param->rej >= selective_reject;
 	}
 
-	if (param->modulo != G_UNKNOWN) {
+	if (param->modulo != modulo_unknown) {
 	  // Disaster if aren't agreeing on this.
 	  S->modulo = param->modulo;
 	}

ax25_pad.c

@@ -170,10 +170,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifndef _POSIX_C_SOURCE
-
-#define _POSIX_C_SOURCE 1
-#endif
 
 #include "regex.h"
 

ax25_pad.h

@@ -283,7 +283,7 @@ static inline int ax25_get_num_info (packet_t this_p)
 #endif
 
 
-typedef enum ax25_modulo_e { modulo_8 = 8, modulo_128 = 128 } ax25_modulo_t;
+typedef enum ax25_modulo_e { modulo_unknown = 0, modulo_8 = 8, modulo_128 = 128 } ax25_modulo_t;
 
 typedef enum ax25_frame_type_e {
 

ax25_pad2.c

@@ -207,7 +207,7 @@ packet_t ax25_u_frame (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int num_ad
 	packet_t this_p;
 	unsigned char *p;
 	int ctrl = 0;
-	int t = -1;		// 1 = must be cmd, 0 = must be response, 2 = can be either.
+	unsigned int t = 999;	// 1 = must be cmd, 0 = must be response, 2 = can be either.
 	int i = 0;		// Is Info part allowed?
 
 	this_p = ax25_new ();

decode_aprs.c

@@ -45,9 +45,6 @@
 #include <ctype.h>	/* for isdigit */
 #include <fcntl.h>
 
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 1
-#endif
 #include "regex.h"
 
 #include "ax25_pad.h"
@@ -640,14 +637,14 @@ void decode_aprs_print (decode_aprs_t *A) {
 	  if ( ! A->g_quiet) {
 
 	    for (j=0; j<n; j++) {
-	      if ((unsigned)A->g_comment[j] == (char)0xb0 &&  (j == 0 || ! (A->g_comment[j-1] & 0x80))) {
+	      if ((unsigned char)(A->g_comment[j]) == 0xb0 &&  (j == 0 || ! (A->g_comment[j-1] & 0x80))) {
 	        text_color_set(DW_COLOR_ERROR);
 	        dw_printf("Character code 0xb0 is probably an attempt at a degree symbol.\n");
 	        dw_printf("The correct encoding is 0xc2 0xb0 in UTF-8.\n");
 	      }	    	
 	    }
 	    for (j=0; j<n; j++) {
-	      if ((unsigned)A->g_comment[j] == (char)0xf8 && (j == n-1 || (A->g_comment[j+1] & 0xc0) != 0xc0)) {
+	      if ((unsigned char)(A->g_comment[j]) == 0xf8 && (j == n-1 || (A->g_comment[j+1] & 0xc0) != 0xc0)) {
 	        text_color_set(DW_COLOR_ERROR);
 	        dw_printf("Character code 0xf8 is probably an attempt at a degree symbol.\n");
 	        dw_printf("The correct encoding is 0xc2 0xb0 in UTF-8.\n");	    	
@@ -4103,7 +4100,7 @@ static void process_comment (decode_aprs_t *A, char *pstart, int clen)
  * digipeated, causing the comment to be hundreds of characters long.
  */
 
-	if (clen > sizeof(A->g_comment) - 1) {
+	if (clen > (int)(sizeof(A->g_comment) - 1)) {
 	  if ( ! A->g_quiet) {
 	    text_color_set(DW_COLOR_ERROR);
 	    dw_printf("Comment is extremely long, %d characters.\n", clen);

demod.c

@@ -184,7 +184,7 @@ int demod_init (struct audio_s *pa)
 	        }
 	      }
 
-	      assert (num_letters == strlen(just_letters));
+	      assert (num_letters == (int)(strlen(just_letters)));
 
 /*
  * Pick a good default demodulator if none specified. 
@@ -222,7 +222,7 @@ int demod_init (struct audio_s *pa)
 	      }
 
 
-	      assert (num_letters == strlen(just_letters));
+	      assert (num_letters == (int)(strlen(just_letters)));
 
 /*
  * Put it back together again.

demod_9600.c

@@ -261,7 +261,7 @@ void demod_9600_init (int samples_per_sec, int baud, struct demodulator_state_s
  *
  *--------------------------------------------------------------------*/
 
-static void inline nudge_pll (int chan, int subchan, int slice, float demod_out, struct demodulator_state_s *D);
+inline static void nudge_pll (int chan, int subchan, int slice, float demod_out, struct demodulator_state_s *D);
 
 __attribute__((hot))
 void demod_9600_process_sample (int chan, int sam, struct demodulator_state_s *D)
@@ -484,7 +484,7 @@ void demod_9600_process_sample (int chan, int sam, struct demodulator_state_s *D
  *--------------------------------------------------------------------*/
 
 __attribute__((hot))
-static void inline nudge_pll (int chan, int subchan, int slice, float demod_out_f, struct demodulator_state_s *D)
+inline static void nudge_pll (int chan, int subchan, int slice, float demod_out_f, struct demodulator_state_s *D)
 {
 
 /*

demod_afsk.c

@@ -63,7 +63,7 @@
 #define MAX(a,b) ((a)>(b)?(a):(b))
 
 
-
+#ifndef GEN_FFF
 
 /* Quick approximation to sqrt(x*x+y*y) */
 /* No benefit for regular PC. */
@@ -137,6 +137,8 @@ static inline float agc (float in, float fast_attack, float slow_decay, float *p
 	return (0.0f);
 }
 
+#endif	// ifndef GEN_FFF
+
 
 /*
  * for multi-slicer experiment.
@@ -806,7 +808,7 @@ int main (void)
  *
  *--------------------------------------------------------------------*/
 
-static void inline nudge_pll (int chan, int subchan, int slice, int demod_data, struct demodulator_state_s *D);
+inline static void nudge_pll (int chan, int subchan, int slice, int demod_data, struct demodulator_state_s *D);
 
 __attribute__((hot))
 void demod_afsk_process_sample (int chan, int subchan, int sam, struct demodulator_state_s *D)
@@ -1086,7 +1088,7 @@ void demod_afsk_process_sample (int chan, int subchan, int sam, struct demodulat
 
 
 __attribute__((hot))
-static void inline nudge_pll (int chan, int subchan, int slice, int demod_data, struct demodulator_state_s *D)
+inline static void nudge_pll (int chan, int subchan, int slice, int demod_data, struct demodulator_state_s *D)
 {
 
 /*

demod_psk.c

@@ -579,7 +579,7 @@ void demod_psk_init (enum modem_t modem_type, int samples_per_sec, int bps, char
 
 
 
-static void inline nudge_pll (int chan, int subchan, int slice, int demod_bits, struct demodulator_state_s *D);
+inline static void nudge_pll (int chan, int subchan, int slice, int demod_bits, struct demodulator_state_s *D);
 
 __attribute__((hot))
 void demod_psk_process_sample (int chan, int subchan, int sam, struct demodulator_state_s *D)
@@ -758,7 +758,7 @@ static const int phase_to_gray_v27[8] = {1, 0, 2, 3, 7, 6, 4, 5};
 
 
 __attribute__((hot))
-static void inline nudge_pll (int chan, int subchan, int slice, int demod_bits, struct demodulator_state_s *D)
+inline static void nudge_pll (int chan, int subchan, int slice, int demod_bits, struct demodulator_state_s *D)
 {
 
 /*

dtmf.c

@@ -32,6 +32,8 @@
  * References:	http://eetimes.com/design/embedded/4024443/The-Goertzel-Algorithm
  * 		http://www.ti.com/ww/cn/uprogram/share/ppt/c5000/17dtmf_v13.ppt
  *
+ * Revisions:	1.4 - Added transmit capability.
+ *
  *---------------------------------------------------------------*/
 
 #include "direwolf.h"
@@ -107,7 +109,7 @@ static void push_button (int chan, char button, int ms);
  *
  *		amp		- Signal amplitude, for transmit, on scale of 0 .. 100.
  *
- *				  100 will produce maximum amplitude of +-32k samples. 
+ *				  100 will produce maximum amplitude of +-32k samples.
  *
  * Returns:     None.
  *
@@ -338,8 +340,8 @@ char dtmf_sample (int c, float input)
  *		str	- Character string to send.  0-9, A-D, *, #
  *		speed	- Number of tones per second.  Range 1 to 10.
  *		txdelay	- Delay (ms) from PTT to start.
- *		txtail	- Delay (ms) from end to PTT off.	
- *		
+ *		txtail	- Delay (ms) from end to PTT off.
+ *
  * Returns:	Total number of milliseconds to activate PTT.
  *		This includes delays before the first tone
  *		and after the last to avoid chopping off part of it.
@@ -353,7 +355,7 @@ int dtmf_send (int chan, char *str, int speed, int txdelay, int txtail)
 {
 	char *p;
 	int len_ms;	// Length of tone or gap between.
-	
+
 	len_ms = (int) ( ( 500.0f / (float)speed ) + 0.5f);
 
 	push_button (chan, ' ', txdelay);