From b7321923afca561abafd371159aef4a0fe358e72 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 7 Dec 2005 15:15:27 +0000 Subject: [PATCH] Cleaned up compiler warnings and errors for Win32 build. --- bacnet-stack/ai.c | 2 +- bacnet-stack/ao.c | 2 +- bacnet-stack/bacdcode.c | 14 ++--- bacnet-stack/bip.c | 4 +- bacnet-stack/device.c | 4 +- bacnet-stack/ports/win32/bacnet.ide | Bin 52338 -> 52528 bytes bacnet-stack/ports/win32/bacnet/bacnet.plg | 62 ++++++++++++++++----- bacnet-stack/ports/win32/net.h | 2 + 8 files changed, 62 insertions(+), 28 deletions(-) diff --git a/bacnet-stack/ai.c b/bacnet-stack/ai.c index ee65fce9..4a965aaa 100644 --- a/bacnet-stack/ai.c +++ b/bacnet-stack/ai.c @@ -72,7 +72,7 @@ int Analog_Input_Encode_Property_APDU( int apdu_len = 0; // return value BACNET_BIT_STRING bit_string; char text_string[32] = {""}; - float value = 3.141592; + float value = 3.14; (void)array_index; switch (property) diff --git a/bacnet-stack/ao.c b/bacnet-stack/ao.c index bc99de2a..35dbceee 100644 --- a/bacnet-stack/ao.c +++ b/bacnet-stack/ao.c @@ -153,7 +153,7 @@ int Analog_Output_Encode_Property_APDU( int apdu_len = 0; // return value BACNET_BIT_STRING bit_string; char text_string[32] = {""}; - float real_value = 1.41421356; + float real_value = 1.414; unsigned object_index = 0; unsigned i = 0; diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/bacdcode.c index 701f39ea..a055fd19 100644 --- a/bacnet-stack/bacdcode.c +++ b/bacnet-stack/bacdcode.c @@ -351,10 +351,10 @@ int encode_tag(uint8_t * apdu, uint8_t tag_number, bool context_specific, else { apdu[0] |= 5; if (len_value_type <= 253) { - apdu[len++] = len_value_type; + apdu[len++] = (uint8_t)len_value_type; } else if (len_value_type <= 65535) { apdu[len++] = 254; - len += encode_unsigned16(&apdu[len], len_value_type); + len += encode_unsigned16(&apdu[len], (uint16_t)len_value_type); } else { apdu[len++] = 255; len += encode_unsigned32(&apdu[len], len_value_type); @@ -648,7 +648,7 @@ int decode_bitstring(uint8_t * apdu, uint32_t len_value, bit_string->value[i] = byte_reverse_bits(apdu[len++]); } unused_bits = apdu[0] & 0x07; - bit_string->bits_used = bytes_used * 8; + bit_string->bits_used = (uint8_t)(bytes_used * 8); bit_string->bits_used -= unused_bits; } } @@ -831,7 +831,7 @@ int encode_context_object_id( // assumes that the tag only consumes 1 octet len = encode_bacnet_object_id(&apdu[1], object_type, instance); - len += encode_tag(&apdu[0], tag_number, true, len); + len += encode_tag(&apdu[0], (uint8_t)tag_number, true, len); return len; } @@ -1035,7 +1035,7 @@ int encode_context_unsigned(uint8_t * apdu, int tag_number, int value) int len = 0; len = encode_bacnet_unsigned(&apdu[1], value); - len += encode_tag(&apdu[0], tag_number, true, len); + len += encode_tag(&apdu[0], (uint8_t)tag_number, true, len); return len; } @@ -1137,7 +1137,7 @@ int encode_context_enumerated(uint8_t * apdu, int tag_number, int value) // assumes that the tag only consumes 1 octet len = encode_bacnet_enumerated(&apdu[1], value); - len += encode_tag(&apdu[0], tag_number, true, len); + len += encode_tag(&apdu[0], (uint8_t)tag_number, true, len); return len; } @@ -1209,7 +1209,7 @@ int encode_context_signed(uint8_t * apdu, int tag_number, int value) // assumes that the tag only consumes 1 octet len = encode_bacnet_signed(&apdu[1], value); - len += encode_tag(&apdu[0], tag_number, true, len); + len += encode_tag(&apdu[0], (uint8_t)tag_number, true, len); return len; } diff --git a/bacnet-stack/bip.c b/bacnet-stack/bip.c index dbae44b4..42837c3e 100644 --- a/bacnet-stack/bip.c +++ b/bacnet-stack/bip.c @@ -156,7 +156,7 @@ static int bip_send( else mtu[1] = 0x0A; /* Original-Unicast-NPDU */ mtu_len = 2; - mtu_len += encode_unsigned16(&mtu[mtu_len], pdu_len + 4 /*inclusive*/); + mtu_len += encode_unsigned16(&mtu[mtu_len], (uint16_t)(pdu_len + 4/*inclusive*/) ); memcpy(&mtu[mtu_len], pdu, pdu_len); mtu_len += pdu_len; @@ -238,7 +238,7 @@ uint16_t bip_receive( select_timeout.tv_usec = 1000 * timeout; } FD_ZERO(&read_fds); - FD_SET(BIP_Socket, &read_fds); + FD_SET((unsigned int)BIP_Socket, &read_fds); max = BIP_Socket; /* see if there is a packet for us */ if (select(max + 1, &read_fds, NULL, NULL, &select_timeout) > 0) diff --git a/bacnet-stack/device.c b/bacnet-stack/device.c index 19e66efe..cf140254 100644 --- a/bacnet-stack/device.c +++ b/bacnet-stack/device.c @@ -374,7 +374,7 @@ int Device_Encode_Property_APDU( { // bitstring_set_bit(&bit_string, i, apdu_service_supported(i)); // initialize all the services to not-supported - bitstring_set_bit(&bit_string, i, false); + bitstring_set_bit(&bit_string, (uint8_t)i, false); } // initialize those we support bitstring_set_bit(&bit_string, SERVICE_SUPPORTED_WHO_IS, true); @@ -387,7 +387,7 @@ int Device_Encode_Property_APDU( for (i = 0; i < MAX_BACNET_OBJECT_TYPES; i++) { // initialize all the object types to not-supported - bitstring_set_bit(&bit_string, i, false); + bitstring_set_bit(&bit_string, (uint8_t)i, false); } bitstring_set_bit(&bit_string, OBJECT_DEVICE, true); bitstring_set_bit(&bit_string, OBJECT_ANALOG_INPUT, true); diff --git a/bacnet-stack/ports/win32/bacnet.ide b/bacnet-stack/ports/win32/bacnet.ide index 5fd17e5fe5a9ce57328f451084c6387acc00b057..08db2149d66fefff402252b577f9ba4d5996925a 100644 GIT binary patch delta 4967 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 UhK%CE#51D9ZX^>t{g}vq0f3zS1poj5 delta 4744 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

Command Lines

-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP298.tmp" with contents +Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC4.tmp" with contents [ -/nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"C:\code\bacnet-stack\arf.c" -"C:\code\bacnet-stack\bacfile.c" +/nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\code\bacnet-stack\device.c" ] -Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP298.tmp" -Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP299.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC4.tmp" +Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC5.tmp" with contents [ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept ".\Debug\abort.obj" @@ -21,10 +20,11 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32 ".\Debug\ai.obj" ".\Debug\ao.obj" ".\Debug\apdu.obj" +".\Debug\arf.obj" ".\Debug\bacdcode.obj" ".\Debug\bacerror.obj" +".\Debug\bacfile.obj" ".\Debug\bigend.obj" -".\Debug\bip.obj" ".\Debug\crc.obj" ".\Debug\datalink.obj" ".\Debug\device.obj" @@ -38,22 +38,54 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32 ".\Debug\tsm.obj" ".\Debug\whois.obj" ".\Debug\wp.obj" -".\Debug\arf.obj" -".\Debug\bacfile.obj" +".\Debug\bip-init.obj" +".\Debug\bip.obj" +".\Debug\bactext.obj" +".\Debug\indtext.obj" ] -Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP299.tmp" +Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC5.tmp"

Output Window

Compiling... -arf.c -bacfile.c -Generating Code... -c:\code\bacnet-stack\bacfile.c(279) : warning C4761: integral size mismatch in argument; conversion supplied +device.c Linking... +Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp" with contents +[ +/nologo /o"Debug/bacnet.bsc" +".\Debug\abort.sbr" +".\Debug\address.sbr" +".\Debug\ai.sbr" +".\Debug\ao.sbr" +".\Debug\apdu.sbr" +".\Debug\arf.sbr" +".\Debug\bacdcode.sbr" +".\Debug\bacerror.sbr" +".\Debug\bacfile.sbr" +".\Debug\bigend.sbr" +".\Debug\crc.sbr" +".\Debug\datalink.sbr" +".\Debug\device.sbr" +".\Debug\handlers.sbr" +".\Debug\iam.sbr" +".\Debug\main.sbr" +".\Debug\npdu.sbr" +".\Debug\reject.sbr" +".\Debug\ringbuf.sbr" +".\Debug\rp.sbr" +".\Debug\tsm.sbr" +".\Debug\whois.sbr" +".\Debug\wp.sbr" +".\Debug\bip-init.sbr" +".\Debug\bip.sbr" +".\Debug\bactext.sbr" +".\Debug\indtext.sbr"] +Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp" +Creating browse info file... +

Output Window

Results

-bacnet.exe - 0 error(s), 1 warning(s) +bacnet.exe - 0 error(s), 0 warning(s) diff --git a/bacnet-stack/ports/win32/net.h b/bacnet-stack/ports/win32/net.h index 7432ffa2..ca904f83 100644 --- a/bacnet-stack/ports/win32/net.h +++ b/bacnet-stack/ports/win32/net.h @@ -33,4 +33,6 @@ #define close closesocket +typedef int socklen_t; + #endif