Adjusted the max input value for instance number, and moved the checks for valid ranges into the numeric portion instead of the string portion for WhoHas demo.

This commit is contained in:
skarg
2006-02-17 17:46:40 +00:00
parent ecb73d6bc0
commit 021418d11d
+2 -2
View File
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
"The object-name can be any string of characters.\r\n", "The object-name can be any string of characters.\r\n",
filename_remove_path(argv[0]), filename_remove_path(argv[0]),
MAX_BACNET_OBJECT_TYPE-1, MAX_BACNET_OBJECT_TYPE-1,
BACNET_MAX_INSTANCE-1); BACNET_MAX_INSTANCE);
return 0; return 0;
} }
/* decode the command line parameters */ /* decode the command line parameters */
@@ -169,7 +169,6 @@ int main(int argc, char *argv[])
{ {
Target_Object_Type = strtol(argv[1],NULL,0); Target_Object_Type = strtol(argv[1],NULL,0);
Target_Object_Instance = strtol(argv[2],NULL,0); Target_Object_Instance = strtol(argv[2],NULL,0);
}
if (Target_Object_Instance > BACNET_MAX_INSTANCE) if (Target_Object_Instance > BACNET_MAX_INSTANCE)
{ {
fprintf(stderr,"object-instance=%u - it must be less than %u\r\n", fprintf(stderr,"object-instance=%u - it must be less than %u\r\n",
@@ -182,6 +181,7 @@ int main(int argc, char *argv[])
Target_Object_Type,MAX_BACNET_OBJECT_TYPE+1); Target_Object_Type,MAX_BACNET_OBJECT_TYPE+1);
return 1; return 1;
} }
}
/* setup my info */ /* setup my info */
Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE); Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
Init_Service_Handlers(); Init_Service_Handlers();