Changed a bunch of debug and information printfs so that they have a better chance of working on systems where int is smaller than 32 bits also fixed the signed/unsigned type of some to match the type of the arguments.
This commit is contained in:
@@ -133,7 +133,7 @@ char *Analog_Input_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_ANALOG_INPUTS) {
|
||||
sprintf(text_string, "ANALOG INPUT %u", object_instance);
|
||||
sprintf(text_string, "ANALOG INPUT %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
@@ -256,7 +256,7 @@ char *Analog_Output_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_ANALOG_OUTPUTS) {
|
||||
sprintf(text_string, "ANALOG OUTPUT %u", object_instance);
|
||||
sprintf(text_string, "ANALOG OUTPUT %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
@@ -215,7 +215,7 @@ char *Analog_Value_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_ANALOG_VALUES) {
|
||||
sprintf(text_string, "ANALOG VALUE %u", object_instance);
|
||||
sprintf(text_string, "ANALOG VALUE %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
@@ -203,7 +203,7 @@ int bacfile_encode_property_apdu(
|
||||
object_instance);
|
||||
break;
|
||||
case PROP_OBJECT_NAME:
|
||||
sprintf(text_string, "FILE %d", object_instance);
|
||||
sprintf(text_string, "FILE %lu", (unsigned long)object_instance);
|
||||
characterstring_init_ansi(&char_string, text_string);
|
||||
apdu_len =
|
||||
encode_application_character_string(&apdu[0], &char_string);
|
||||
|
||||
@@ -279,7 +279,7 @@ char *Binary_Input_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_BINARY_INPUTS) {
|
||||
sprintf(text_string, "BINARY INPUT %u", object_instance);
|
||||
sprintf(text_string, "BINARY INPUT %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@ char *Binary_Output_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_BINARY_OUTPUTS) {
|
||||
sprintf(text_string, "BINARY OUTPUT %u", object_instance);
|
||||
sprintf(text_string, "BINARY OUTPUT %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ char *Binary_Value_Name(
|
||||
static char text_string[32] = ""; /* okay for single thread */
|
||||
|
||||
if (object_instance < MAX_BINARY_VALUES) {
|
||||
sprintf(text_string, "BINARY VALUE %u", object_instance);
|
||||
sprintf(text_string, "BINARY VALUE %lu", (unsigned long)object_instance);
|
||||
return text_string;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user