Removed strcasecmp and strncasecmp because they are non-standand C functions. (#858)

This commit is contained in:
Steve Karg
2024-11-21 12:29:08 -06:00
committed by GitHub
parent f149481eff
commit 776b212995
13 changed files with 72 additions and 45 deletions
+3 -6
View File
@@ -18,6 +18,7 @@
#include "bacnet/iam.h"
#include "bacnet/version.h"
#include "bacnet/datetime.h"
#include "bacnet/bacstr.h"
/* basic datalink, timer, and filename */
#include "bacnet/datalink/dlmstp.h"
#include "bacnet/basic/sys/mstimer.h"
@@ -28,10 +29,6 @@
#include "bacport.h"
#include "rs485.h"
#ifdef _WIN32
#define strncasecmp(x, y, z) _strnicmp(x, y, z)
#endif
/* define our Data Link Type for libPCAP */
#define DLT_BACNET_MS_TP (165)
/* local min/max macros */
@@ -1100,7 +1097,7 @@ int main(int argc, char *argv[])
RS485_Set_Interface(argv[argi]);
}
#if defined(_WIN32)
if (strncasecmp(argv[argi], "com", 3) == 0) {
if (bacnet_strnicmp(argv[argi], "com", 3) == 0) {
/* legacy command line options */
RS485_Set_Interface(argv[argi]);
if ((argi + 1) < argc) {
@@ -1110,7 +1107,7 @@ int main(int argc, char *argv[])
}
}
#else
if (strncasecmp(argv[argi], "/dev/", 5) == 0) {
if (bacnet_strnicmp(argv[argi], "/dev/", 5) == 0) {
/* legacy command line options */
RS485_Set_Interface(argv[argi]);
if ((argi + 1) < argc) {
+2 -2
View File
@@ -159,9 +159,9 @@ int main(int argc, char *argv[])
/* decode the command line parameters */
data->group_number = strtol(argv[1], NULL, 0);
data->write_priority = strtol(argv[2], NULL, 0);
if (strcasecmp(argv[3], "inhibit") == 0) {
if (bacnet_stricmp(argv[3], "inhibit") == 0) {
data->inhibit_delay = WRITE_GROUP_INHIBIT_DELAY_TRUE;
} else if (strcasecmp(argv[3], "delay") == 0) {
} else if (bacnet_stricmp(argv[3], "delay") == 0) {
data->inhibit_delay = WRITE_GROUP_INHIBIT_DELAY_FALSE;
} else {
data->inhibit_delay = WRITE_GROUP_INHIBIT_DELAY_FALSE;