File wanpipe-07-aftpipemon-typepun.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File wanpipe-07-aftpipemon-typepun.diff of Package wanpipe

Resolve warnings in aftpipemon

aftpipemon.c: In function 'operational_stats':
aftpipemon.c:513:9: warning: format '%i' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat]
aftpipemon.c: In function 'aft_read_hwec_status':
aftpipemon.c:1185:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
aftpipemon.c: At top level:
aftpipemon.c:1400:12: warning: function declaration isn't a prototype [-Wstrict-prototypes]
aftpipemon.c:1418:12: warning: function declaration isn't a prototype [-Wstrict-prototypes]
aftpipemon.c:1436:12: warning: function declaration isn't a prototype [-Wstrict-prototypes]
aftpipemon.c: In function 'aft_router_up_time':
aftpipemon.c:1763:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

---
 util/wanpipemon/aftpipemon.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: wanpipe-3.5.27.4/util/wanpipemon/aftpipemon.c
===================================================================
--- wanpipe-3.5.27.4.orig/util/wanpipemon/aftpipemon.c
+++ wanpipe-3.5.27.4/util/wanpipemon/aftpipemon.c
@@ -509,7 +509,7 @@ static void operational_stats (void)
 	DO_COMMAND(wan_udp);
 
 	if (wan_udp.wan_udphdr_data_len  != sizeof(wanpipe_chan_stats_t)) {
-     	 printf("Error: op stats data_len=%i != stats %i\n",
+     	 printf("Error: op stats data_len=%i != stats %zu\n",
  		     wan_udp.wan_udphdr_data_len,sizeof(wanpipe_chan_stats_t));  
 	}
 
@@ -1182,7 +1182,7 @@ static int aft_read_hwec_status()
 		fflush(stdout);
 		return 0;
 	}
-	hwec_status = *(u_int32_t*)&wan_udp.wan_udphdr_data[0];
+	memcpy(&hwec_status, wan_udp.wan_udphdr_data, sizeof(hwec_status));
 	for(channel = 0; channel < 32; channel++){
 		if (hwec_status & (1 << channel)){
 			printf(
@@ -1397,7 +1397,7 @@ static int aft_gsm_uart_debug(int enable
 	return 0;
 }
 
-static int aft_gsm_audio_debug()
+static int aft_gsm_audio_debug(void)
 {
 	wan_udp.wan_udphdr_command = WAN_GSM_AUDIO_DEBUG;
 	wan_udp.wan_udphdr_return_code = 0xaa;
@@ -1415,7 +1415,7 @@ static int aft_gsm_audio_debug()
 	return 0;
 }
 
-static int aft_gsm_pll_reset()
+static int aft_gsm_pll_reset(void)
 {
 	wan_udp.wan_udphdr_command = WAN_GSM_PLL_RESET;
 	wan_udp.wan_udphdr_return_code = 0xaa;
@@ -1433,7 +1433,7 @@ static int aft_gsm_pll_reset()
 	return 0;
 }
 
-static int aft_gsm_power_toggle()
+static int aft_gsm_power_toggle(void)
 {
 	wan_udp.wan_udphdr_command = WAN_GSM_POWER_TOGGLE;
 	wan_udp.wan_udphdr_return_code = 0xaa;
@@ -1760,7 +1760,7 @@ static void aft_router_up_time( void )
 	wan_udp.wan_udphdr_data[0] = 0;
 	DO_COMMAND(wan_udp);
 	
-	time = *(u_int32_t*)&wan_udp.wan_udphdr_data[0];
+	memcpy(&time, wan_udp.wan_udphdr_data, sizeof(time));
 	
 	BANNER("ROUTER UP TIME");

Places

File wanpipe-07-aftpipemon-typepun.diff of Package wanpipe

Places