dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various compiler warnings. Thank you, Morten Kvistgaard!

Browse Source
This commit is contained in:
skarg
2013-12-09 20:31:47 +00:00
parent 7f58784576
commit 9fb6b9107a
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/s_ptransfer.c
+8
View File
@@ -47,6 +47,14 @@
/** @file s_ptransfer.c Send a Private Transfer request. */ /** @file s_ptransfer.c Send a Private Transfer request. */
/* This function is exported. Hence this unnecessary prototype. */
uint8_t Send_Private_Transfer_Request(
uint32_t device_id,
uint16_t vendor_id,
uint32_t service_number,
char block_number,
DATABLOCK * block);
uint8_t Send_Private_Transfer_Request( uint8_t Send_Private_Transfer_Request(
uint32_t device_id, uint32_t device_id,
uint16_t vendor_id, uint16_t vendor_id,
bacnet-stack/demo/object/trendlog.c
+2 -2
View File
@@ -1670,8 +1670,8 @@ void TL_fetch_property(
{ {
uint8_t ValueBuf[MAX_APDU]; /* This is a big buffer in case someone selects the device object list for example */ uint8_t ValueBuf[MAX_APDU]; /* This is a big buffer in case someone selects the device object list for example */
uint8_t StatusBuf[3]; /* Should be tag, bits unused in last octet and 1 byte of data */ uint8_t StatusBuf[3]; /* Should be tag, bits unused in last octet and 1 byte of data */
BACNET_ERROR_CLASS error_class; BACNET_ERROR_CLASS error_class = 0;
BACNET_ERROR_CODE error_code; BACNET_ERROR_CODE error_code = ERROR_CODE_SUCCESS;
int iLen; int iLen;
uint8_t ucCount; uint8_t ucCount;
TL_LOG_INFO *CurrentLog; TL_LOG_INFO *CurrentLog;
bacnet-stack/demo/ptransfer/main.c
+2 -3
View File
@@ -62,7 +62,7 @@
#define _stricmp stricmp #define _stricmp stricmp
#endif #endif
uint8_t Send_Private_Transfer_Request( extern uint8_t Send_Private_Transfer_Request(
uint32_t device_id, uint32_t device_id,
uint16_t vendor_id, uint16_t vendor_id,
uint32_t service_number, uint32_t service_number,
@@ -176,7 +176,6 @@ int main(
int iCount = 0; int iCount = 0;
int iType = 0; int iType = 0;
int iKey; int iKey;
static int iLimit[3] = { 7, 11, 7 };
if (((argc != 2) && (argc != 3)) || ((argc >= 2) && if (((argc != 2) && (argc != 3)) || ((argc >= 2) &&
(strcmp(argv[1], "--help") == 0))) { (strcmp(argv[1], "--help") == 0))) {
@@ -300,7 +299,7 @@ int main(
NewData.cMyByte1 = iCount; NewData.cMyByte1 = iCount;
NewData.cMyByte2 = 255 - iCount; NewData.cMyByte2 = 255 - iCount;
NewData.fMyReal = (float) iCount; NewData.fMyReal = (float) iCount;
strcpy(NewData.sMyString, "Test Data - [x]"); strcpy((char*)NewData.sMyString, "Test Data - [x]");
NewData.sMyString[13] = 'a' + iCount; NewData.sMyString[13] = 'a' + iCount;
printf("Sending block %d\n", iCount); printf("Sending block %d\n", iCount);
invoke_id = invoke_id =
bacnet-stack/ports/win32/bip-init.c
+2
View File
@@ -42,8 +42,10 @@
#include "bip.h" #include "bip.h"
#include "net.h" #include "net.h"
#if defined(_MSC_VER)
#pragma comment(lib, "Ws2_32.lib") #pragma comment(lib, "Ws2_32.lib")
#pragma comment(lib, "IPHLPAPI.lib") #pragma comment(lib, "IPHLPAPI.lib")
#endif
bool BIP_Debug = false; bool BIP_Debug = false;