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

Bugfix/file object file size type (#116)

Browse Source 
* Fix file object example file size type

* Add include for definition of BACnet unsigned.

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2020-09-03 22:02:49 -05:00
committed by GitHub
parent b872ee7859
commit 8a866b6754
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/bacfile.c
+7 -3
View File
@@ -163,17 +163,21 @@ static long fsize(FILE *pFile)
return (size);
}
unsigned bacfile_file_size(uint32_t object_instance)
BACNET_UNSIGNED_INTEGER bacfile_file_size(uint32_t object_instance)
{
char *pFilename = NULL;
FILE *pFile = NULL;
unsigned file_size = 0;
long file_position = 0;
BACNET_UNSIGNED_INTEGER file_size = 0;
pFilename = bacfile_name(object_instance);
if (pFilename) {
pFile = fopen(pFilename, "rb");
if (pFile) {
file_size = fsize(pFile);
file_position = fsize(pFile);
if (file_position >= 0) {
file_size = (BACNET_UNSIGNED_INTEGER)file_position;
}
fclose(pFile);
}
}
src/bacnet/basic/object/bacfile.h
+2 -1
View File
@@ -39,6 +39,7 @@
#include "bacnet/bacnet_stack_exports.h"
#include "bacnet/bacdef.h"
#include "bacnet/bacenum.h"
#include "bacnet/bacint.h"
#include "bacnet/apdu.h"
#include "bacnet/arf.h"
#include "bacnet/awf.h"
@@ -108,7 +109,7 @@ extern "C" {
void bacfile_init(
void);
BACNET_STACK_EXPORT
uint32_t bacfile_file_size(
BACNET_UNSIGNED_INTEGER bacfile_file_size(
uint32_t instance);
/* handling for read property service */