From 172fcb7c7e7bf946246da0e9d3f15da212105f9a Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Tue, 23 Nov 2021 09:48:15 +0000
Subject: [PATCH] Now that we have a matches() function, prefer it over
strncmp()
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1479 81a1dc3b-b13d-400b-aceb-764788c761c2
---
ChangeLog | 4 ++++
jtag3.c | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e2a64b1..b64483df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-11-23 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+ * jtag3.c: Use matches() instead of strncmp()
+
2021-11-23 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
patch #9757: Fix ATtiny817 Xplained Mini programmer
diff --git a/jtag3.c b/jtag3.c
index 4357e5d2..80e028e4 100644
--- a/jtag3.c
+++ b/jtag3.c
@@ -1158,7 +1158,7 @@ static int jtag3_initialize(PROGRAMMER * pgm, AVRPART * p)
u32_to_b4(xd.nvm_boot_offset, m->offset);
} else if (strcmp(m->desc, "fuse1") == 0) {
u32_to_b4(xd.nvm_fuse_offset, m->offset & ~7);
- } else if (strncmp(m->desc, "lock", 4) == 0) {
+ } else if (matches(m->desc, "lock")) {
u32_to_b4(xd.nvm_lock_offset, m->offset);
} else if (strcmp(m->desc, "usersig") == 0) {
u32_to_b4(xd.nvm_user_sig_offset, m->offset);
@@ -1436,7 +1436,7 @@ static int jtag3_parseextparms(PROGRAMMER * pgm, LISTID extparms)
for (ln = lfirst(extparms); ln; ln = lnext(ln)) {
extended_param = ldata(ln);
- if (strncmp(extended_param, "jtagchain=", strlen("jtagchain=")) == 0) {
+ if (matches(extended_param, "jtagchain=")) {
unsigned int ub, ua, bb, ba;
if (sscanf(extended_param, "jtagchain=%u,%u,%u,%u", &ub, &ua, &bb, &ba)
!= 4) {
@@ -1476,7 +1476,7 @@ int jtag3_open_common(PROGRAMMER * pgm, char * port)
return -1;
#endif
- if (strncmp(port, "usb", 3) != 0) {
+ if (matches(port, "usb")) {
avrdude_message(MSG_INFO, "%s: jtag3_open_common(): JTAGICE3/EDBG port names must start with \"usb\"\n",
progname);
return -1;
@@ -1942,11 +1942,11 @@ static int jtag3_read_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
addr = 2;
if (pgm->flag & PGM_FL_IS_DW)
unsupp = 1;
- } else if (strncmp(mem->desc, "lock", 4) == 0) {
+ } else if (matches(mem->desc, "lock")) {
cmd[3] = MTYPE_LOCK_BITS;
if (pgm->flag & PGM_FL_IS_DW)
unsupp = 1;
- } else if (strncmp(mem->desc, "fuse", strlen("fuse")) == 0) {
+ } else if (matches(mem->desc, "fuse")) {
cmd[3] = MTYPE_FUSE_BITS;
if (!(p->flags & AVRPART_HAS_UPDI))
addr = mem->offset & 7;
@@ -2095,7 +2095,7 @@ static int jtag3_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
addr = 2;
if (pgm->flag & PGM_FL_IS_DW)
unsupp = 1;
- } else if (strncmp(mem->desc, "fuse", strlen("fuse")) == 0) {
+ } else if (matches(mem->desc, "fuse")) {
cmd[3] = MTYPE_FUSE_BITS;
if (!(p->flags & AVRPART_HAS_UPDI))
addr = mem->offset & 7;
@@ -2103,7 +2103,7 @@ static int jtag3_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
cmd[3] = MTYPE_USERSIG;
} else if (strcmp(mem->desc, "prodsig") == 0) {
cmd[3] = MTYPE_PRODSIG;
- } else if (strncmp(mem->desc, "lock", 4) == 0) {
+ } else if (matches(mem->desc, "lock")) {
cmd[3] = MTYPE_LOCK_BITS;
if (pgm->flag & PGM_FL_IS_DW)
unsupp = 1;
@@ -2404,7 +2404,7 @@ static unsigned int jtag3_memaddr(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, uns
if (strcmp(m->desc, "fuses") == 0) {
addr += m->offset;
}
- else if (strncmp(m->desc, "fuse", strlen("fuse")) == 0) {
+ else if (matches(m->desc, "fuse")) {
addr = m->offset;
}
else if (strcmp(m->desc, "flash") != 0) {