From 2501fcd97b8b22137c69519194b62c2ac9fecba0 Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Wed, 9 Aug 2023 23:07:41 +0200
Subject: [PATCH] Replace strcasecmp with str_caseeq

---
 src/avrintel.c   | 2 +-
 src/buspirate.c  | 6 +++---
 src/config.c     | 2 +-
 src/pgm_type.c   | 2 +-
 src/serialupdi.c | 4 ++--
 src/usb_libusb.c | 2 +-
 src/usbasp.c     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/avrintel.c b/src/avrintel.c
index f61beee8..580c2f4c 100644
--- a/src/avrintel.c
+++ b/src/avrintel.c
@@ -47,7 +47,7 @@ int upidxsig(const uint8_t *sigs) {
 // Given the long name of a part return index in uP table or -1 if not found
 int upidxname(const char *name) {
   for(size_t i=0; i < sizeof uP_table/sizeof *uP_table; i++)
-    if(0 == strcasecmp(name, uP_table[i].name))
+    if(str_caseeq(name, uP_table[i].name))
       return i;
 
   return -1;
diff --git a/src/buspirate.c b/src/buspirate.c
index 8c3ee1a9..8a3213a3 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -342,11 +342,11 @@ buspirate_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 			char *resetpin;
 			while ((resetpin = strtok(preset, ","))) {
 				preset = NULL; /* for subsequent strtok() calls */
-				if (strcasecmp(resetpin, "cs") == 0)
+				if (str_caseeq(resetpin, "cs"))
 					PDATA(pgm)->reset |= BP_RESET_CS;
-				else if (strcasecmp(resetpin, "aux") == 0 || strcasecmp(reset, "aux1") == 0)
+				else if (str_caseeq(resetpin, "aux") || str_caseeq(reset, "aux1"))
 					PDATA(pgm)->reset |= BP_RESET_AUX;
-				else if (strcasecmp(resetpin, "aux2") == 0)
+				else if (str_caseeq(resetpin, "aux2"))
 					PDATA(pgm)->reset |= BP_RESET_AUX2;
 				else {
 					pmsg_error("reset must be either CS or AUX\n");
diff --git a/src/config.c b/src/config.c
index 9cf14b60..9d2c790e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -939,7 +939,7 @@ void cfg_update_mcuid(AVRPART *part) {
 
   // Find an entry that shares the same name, overwrite mcuid with known, existing mcuid
   for(size_t i=0; i < sizeof uP_table/sizeof *uP_table; i++) {
-    if(strcasecmp(part->desc, uP_table[i].name) == 0) {
+    if(str_caseeq(part->desc, uP_table[i].name)) {
       if(part->mcuid != (int) uP_table[i].mcuid) {
         if(part->mcuid >= 0 && verbose >= MSG_DEBUG)
           yywarning("overwriting mcuid of part %s to be %d", part->desc, uP_table[i].mcuid);
diff --git a/src/pgm_type.c b/src/pgm_type.c
index 072a0f1e..547bfa0a 100644
--- a/src/pgm_type.c
+++ b/src/pgm_type.c
@@ -118,7 +118,7 @@ const PROGRAMMER_TYPE programmers_types[] = { // Name(s) the programmers call th
 
 const PROGRAMMER_TYPE *locate_programmer_type(const char *id) {
   for(size_t i = 0; i < sizeof programmers_types/sizeof*programmers_types; i++)
-    if(strcasecmp(id, programmers_types[i].id) == 0)
+    if(str_caseeq(id, programmers_types[i].id))
       return programmers_types + i;
 
   return NULL;
diff --git a/src/serialupdi.c b/src/serialupdi.c
index a4194be1..ce74df5a 100644
--- a/src/serialupdi.c
+++ b/src/serialupdi.c
@@ -981,9 +981,9 @@ static int serialupdi_parseextparms(const PROGRAMMER *pgm, const LISTID extparms
     extended_param = ldata(ln);
 
     if (sscanf(extended_param, "rtsdtr=%4s", rts_mode) == 1) {
-      if (strcasecmp(rts_mode, "low") == 0) {
+      if (str_caseeq(rts_mode, "low")) {
         updi_set_rts_mode(pgm, RTS_MODE_LOW);
-      } else if (strcasecmp(rts_mode, "high") == 0) {
+      } else if (str_caseeq(rts_mode, "high")) {
         updi_set_rts_mode(pgm, RTS_MODE_HIGH);
       } else {
         pmsg_error("RTS/DTR mode must be LOW or HIGH\n");
diff --git a/src/usb_libusb.c b/src/usb_libusb.c
index 24305b9c..a7847b35 100644
--- a/src/usb_libusb.c
+++ b/src/usb_libusb.c
@@ -179,7 +179,7 @@ static int usbdev_open(const char *port, union pinfo pinfo, union filedescriptor
 		       * right-to-left.
 		       */
 		      x = strlen(string) - strlen(serno);
-		      if (strcasecmp(string + x, serno) != 0)
+		      if (!str_caseeq(string + x, serno))
 			{
                           pmsg_debug("usbdev_open(): serial number does not match\n");
 			  usb_close(udev);
diff --git a/src/usbasp.c b/src/usbasp.c
index 073ba16b..79ad5ac4 100644
--- a/src/usbasp.c
+++ b/src/usbasp.c
@@ -561,7 +561,7 @@ static int usbasp_open(PROGRAMMER *pgm, const char *port) {
     /* try alternatives */
     if(str_eq(pgmid, "usbasp")) {
     /* for id usbasp autodetect some variants */
-      if(strcasecmp(port, "nibobee") == 0) {
+      if(str_caseeq(port, "nibobee")) {
         pmsg_error("using -C usbasp -P nibobee is deprecated, use -C nibobee instead\n");
         if (usbOpenDevice(&PDATA(pgm)->usbhandle, USBASP_NIBOBEE_VID, "www.nicai-systems.com",
 		        USBASP_NIBOBEE_PID, "NIBObee") != 0) {