Code cleanup to get rid of some warnings during compilation.

This commit is contained in:
minack
2009-07-08 22:25:54 +00:00
parent bee5bf3ac2
commit 88f3aab51d
12 changed files with 54 additions and 44 deletions
+8 -10
View File
@@ -504,7 +504,7 @@ int event_notify_decode_service_request(
decode_context_enumerated(&apdu[len], 6, &value)) == -1) {
return -1;
} else {
data->eventType = value;
data->eventType = (BACNET_EVENT_TYPE)value;
len += section_length;
}
/* tag 7 - messageText */
@@ -533,7 +533,7 @@ int event_notify_decode_service_request(
decode_context_enumerated(&apdu[len], 8, &value)) == -1) {
return -1;
} else {
data->notifyType = value;
data->notifyType = (BACNET_NOTIFY_TYPE)value;
len += section_length;
}
switch (data->notifyType) {
@@ -553,7 +553,7 @@ int event_notify_decode_service_request(
&value)) == -1) {
return -1;
} else {
data->fromState = value;
data->fromState = (BACNET_EVENT_STATE)value;
len += section_length;
}
break;
@@ -561,15 +561,14 @@ int event_notify_decode_service_request(
/* FIXME: handle this case */
default:
return -1;
break;
}
/* tag 11 - toState */
if ((section_length =
decode_context_enumerated(&apdu[len], 11, &value)) == -1) {
return -1;
} else {
data->toState = value;
data->toState = (BACNET_EVENT_STATE)value;
len += section_length;
}
/* tag 12 - eventValues */
@@ -751,7 +750,7 @@ int event_notify_decode_service_request(
return -1;
}
data->notificationParams.changeOfLifeSafety.newState =
value;
(BACNET_LIFE_SAFETY_STATE)value;
len += section_length;
if (-1 == (section_length =
@@ -760,7 +759,7 @@ int event_notify_decode_service_request(
return -1;
}
data->notificationParams.changeOfLifeSafety.newMode =
value;
(BACNET_LIFE_SAFETY_MODE)value;
len += section_length;
if (-1 == (section_length =
@@ -777,7 +776,7 @@ int event_notify_decode_service_request(
return -1;
}
data->notificationParams.changeOfLifeSafety.
operationExpected = value;
operationExpected = (BACNET_LIFE_SAFETY_OPERATION)value;
len += section_length;
break;
@@ -853,7 +852,6 @@ int event_notify_decode_service_request(
/* FIXME: handle this case */
default:
return -1;
break;
}
}