From cff20d7669c01e0de9a68d07665b7a4729aa74e7 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 8 Mar 2008 15:09:14 +0000 Subject: [PATCH] Cleaned up compiler warnings for Borland 5.5 compile. --- bacnet-stack/demo/handler/h_cov.c | 4 +++- bacnet-stack/include/bvlc.h | 2 +- bacnet-stack/ports/win32/dlmstp.c | 3 +++ bacnet-stack/src/bip.c | 4 ++-- bacnet-stack/src/bvlc.c | 7 +++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bacnet-stack/demo/handler/h_cov.c b/bacnet-stack/demo/handler/h_cov.c index d069b387..df17bf65 100644 --- a/bacnet-stack/demo/handler/h_cov.c +++ b/bacnet-stack/demo/handler/h_cov.c @@ -103,6 +103,8 @@ static int cov_encode_subscription( int apdu_len = 0; BACNET_OCTET_STRING octet_string; + /* FIXME: unused parameter */ + max_apdu = max_apdu; /* Recipient [0] BACnetRecipientProcess - opening */ len = encode_opening_tag(&apdu[apdu_len], 0); apdu_len += len; @@ -385,7 +387,7 @@ void handler_cov_task( uint32_t elapsed_seconds) { int index; - int lifetime_seconds; + uint32_t lifetime_seconds; BACNET_OBJECT_ID object_id; bool status = false; diff --git a/bacnet-stack/include/bvlc.h b/bacnet-stack/include/bvlc.h index fdb639da..6f567a86 100644 --- a/bacnet-stack/include/bvlc.h +++ b/bacnet-stack/include/bvlc.h @@ -47,7 +47,7 @@ extern "C" { #if defined(BBMD_ENABLED) && BBMD_ENABLED void bvlc_maintenance_timer( - unsigned seconds); + time_t seconds); #else #define bvlc_maintenance_timer(x) #endif diff --git a/bacnet-stack/ports/win32/dlmstp.c b/bacnet-stack/ports/win32/dlmstp.c index cd18c41c..0d7458d9 100644 --- a/bacnet-stack/ports/win32/dlmstp.c +++ b/bacnet-stack/ports/win32/dlmstp.c @@ -330,6 +330,9 @@ bool dlmstp_compare_data_expecting_reply( struct DER_compare_t request; struct DER_compare_t reply; + /* unused parameters */ + request_pdu_len = request_pdu_len; + reply_pdu_len = reply_pdu_len; /* decode the request data */ request.address.mac[0] = src_address; request.address.mac_len = 1; diff --git a/bacnet-stack/src/bip.c b/bacnet-stack/src/bip.c index 1454ab94..218c4db2 100644 --- a/bacnet-stack/src/bip.c +++ b/bacnet-stack/src/bip.c @@ -206,7 +206,7 @@ uint16_t bip_receive( struct timeval select_timeout; struct sockaddr_in sin = { -1 }; socklen_t sin_len = sizeof(sin); - unsigned i = 0; + uint16_t i = 0; /* Make sure the socket is open */ if (BIP_Socket < 0) @@ -250,7 +250,7 @@ uint16_t bip_receive( (pdu[1] == BVLC_ORIGINAL_BROADCAST_NPDU)) { /* ignore messages from me */ if ((sin.sin_addr.s_addr == htonl(BIP_Address.s_addr)) && - (sin.sin_port == htonl(BIP_Port))) { + (sin.sin_port == htons(BIP_Port))) { pdu_len = 0; #if PRINT_ENABLED fprintf(stderr,"BIP: src is me. Discarded!\n"); diff --git a/bacnet-stack/src/bvlc.c b/bacnet-stack/src/bvlc.c index ce0ba0ab..ac9c5e92 100644 --- a/bacnet-stack/src/bvlc.c +++ b/bacnet-stack/src/bvlc.c @@ -92,7 +92,7 @@ static struct sockaddr_in Remote_BBMD; #if defined(BBMD_ENABLED) && BBMD_ENABLED void bvlc_maintenance_timer( - unsigned seconds) + time_t seconds) { unsigned i = 0; @@ -711,6 +711,9 @@ void bvlc_broadcast_forward_npdu( int mtu_len = 0; struct sockaddr_in bvlc_dest; + /* FIXME: unused parameter */ + sin = sin; + /* load the buffer for transmit */ mtu[0] = BVLL_TYPE_BACNET_IP; mtu[1] = BVLC_ORIGINAL_BROADCAST_NPDU; bvlc_dest.sin_addr.s_addr = htonl(bip_get_broadcast_addr()); @@ -841,7 +844,7 @@ uint16_t bvlc_receive( int function_type = 0; int received_bytes = 0; uint16_t result_code = 0; - unsigned i = 0; + uint16_t i = 0; bool status = false; uint16_t time_to_live = 0;