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

patch for the fixme comments in bacprop

Browse Source
This commit is contained in:
bigjohngoulah
2005-12-18 00:44:23 +00:00
parent de586de7a6
commit 56b7e93010
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/bacprop.c
+10 -17
View File
@@ -54,25 +54,19 @@ PROP_TAG_DATA bacnet_object_device_property_tag_map[] = {
{PROP_SEGMENTATION_SUPPORTED, BACNET_APPLICATION_TAG_ENUMERATED},
{PROP_APDU_TIMEOUT, BACNET_APPLICATION_TAG_UNSIGNED_INT},
{PROP_NUMBER_OF_APDU_RETRIES, BACNET_APPLICATION_TAG_UNSIGNED_INT},
{ 0, 0 }
{ -1, -1 }
};
/* FIXME: BACNET_APPLICATION_TAG_NULL = 0,
FIXME: PROP_ACKED_TRANSITIONS = 0,
perhaps since none of the properties uses the NULL tag,
we could use that as the list terminator, rather than the
property==0. Either that, or start using signed int and
pass a -1 as the list terminator. */
unsigned bacprop_tag_by_index_default(
signed bacprop_tag_by_index_default(
PROP_TAG_DATA *data_list,
unsigned index,
unsigned default_ret)
signed index,
signed default_ret)
{
unsigned pUnsigned = 0;
signed pUnsigned = 0;
if (data_list)
{
while (data_list->prop_id)
while (data_list->prop_id != -1)
{
if (data_list->prop_id == index)
{
@@ -86,9 +80,8 @@ unsigned bacprop_tag_by_index_default(
return pUnsigned?pUnsigned:default_ret;
}
/* FIXME: how do we know when we don't have a match? Maybe use signed return,
or return a boolean and pass the return value as an argument. */
unsigned bacprop_property_tag(BACNET_OBJECT_TYPE type, unsigned prop)
signed bacprop_property_tag(BACNET_OBJECT_TYPE type, signed prop)
{
switch (type)
{
@@ -96,11 +89,11 @@ unsigned bacprop_property_tag(BACNET_OBJECT_TYPE type, unsigned prop)
return bacprop_tag_by_index_default(
bacnet_object_device_property_tag_map,
prop,
0);
-1);
default:
fprintf(stderr, "Unsupported object type");
break;
}
return 0;
return -1;
}
bacnet-stack/bacprop.h
+6 -6
View File
@@ -40,20 +40,20 @@
typedef struct
{
unsigned prop_id; /* index number that matches the text */
unsigned tag_id; /* text pair - use NULL to end the list */
signed prop_id; /* index number that matches the text */
signed tag_id; /* text pair - use NULL to end the list */
} PROP_TAG_DATA;
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
unsigned bacprop_tag_by_index_default(
signed bacprop_tag_by_index_default(
PROP_TAG_DATA *data_list,
unsigned index,
unsigned default_ret);
signed index,
signed default_ret);
unsigned bacprop_property_tag(BACNET_OBJECT_TYPE type, unsigned prop);
signed bacprop_property_tag(BACNET_OBJECT_TYPE type, signed prop);
#ifdef __cplusplus
}