From d91a48242e8b7d0c63479a4e36607d5d600b87e7 Mon Sep 17 00:00:00 2001 From: stefanrueger Date: Fri, 29 Mar 2024 19:55:34 +1300 Subject: [PATCH 1/4] Remove unused avrdude_message() --- src/avrdude.h | 1 - src/main.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/src/avrdude.h b/src/avrdude.h index 3ab85e5a..af3ae443 100644 --- a/src/avrdude.h +++ b/src/avrdude.h @@ -40,7 +40,6 @@ extern int quell_progress; // Quell progress report -q, reduce effective verbo extern const char *partdesc; // Part -p string extern const char *pgmid; // Programmer -c string -int avrdude_message(int msglvl, const char *format, ...); int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int msgmode, int msglvl, const char *format, ...); #define MSG_EXT_ERROR (-3) // OS-type error, no -v option, can be suppressed with -qqqqq diff --git a/src/main.c b/src/main.c index d404732b..06f88be2 100644 --- a/src/main.c +++ b/src/main.c @@ -57,19 +57,6 @@ char progbuf[PATH_MAX]; /* temporary buffer of spaces the same length as progname; used for lining up multiline messages */ -// Old (deprecated) message routine -int avrdude_message(int msglvl, const char *format, ...) -{ - int rc = 0; - va_list ap; - if (verbose >= msglvl) { - va_start(ap, format); - rc = vfprintf(stderr, format, ap); - va_end(ap); - } - return rc; -} - static const char *avrdude_message_type(int msglvl) { switch(msglvl) { case MSG_EXT_ERROR: return "OS error"; From 674128cebc199b62cb15c2e44d49d4b8785c042a Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Fri, 29 Mar 2024 10:18:43 +0100 Subject: [PATCH 2/4] Update NEWS for recent PR/issue --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 76b65357..a8ba33d7 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,7 @@ Changes since version 7.3: * Issues fixed: - Avrintel.h missing from installation #1683 - Use of undeclared identifier 'AVRDUDE_FULL_VERSION' #1706 + - Wrong message level in jtag3_prmsg() #1726 * Pull requests: - Remove 32bit MSYS2 mingw32 and clang32 build #1687 @@ -30,6 +31,8 @@ Changes since version 7.3: - Change port array in PROGRAMMER to be const char * #1699 - Fix cmake build errors related to ac_cfg.h #1707 - Add benchmark option -b for test-avrdude #1709 + - Replace msg_info() by msg_debug() in jtag3_prmsg() + and jtag3_prevent() #1727 * Internals: From 39eea9649d31d8488cdb5a03a60fe596dc58e799 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Fri, 29 Mar 2024 10:23:08 +0100 Subject: [PATCH 3/4] Add note about why avrdude_message2() is named that way. --- src/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.c b/src/main.c index 06f88be2..b1161867 100644 --- a/src/main.c +++ b/src/main.c @@ -77,6 +77,9 @@ static const char *avrdude_message_type(int msglvl) { * Core msg_xyz() routine * See #define lines in avrdude.h of how it is normally called * Side note: if format starts with \v print \n but only if *not* at beginning of line + * + * Function is named that way since there used to be a different avrdude_message() + * before which is gone now. */ int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int msgmode, int msglvl, const char *format, ...) { int rc = 0; From 67867a67769ac911724a63f6b4ca9da3c800c34c Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Fri, 29 Mar 2024 11:05:29 +0100 Subject: [PATCH 4/4] Update NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index a8ba33d7..962a50db 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ Changes since version 7.3: - Avrintel.h missing from installation #1683 - Use of undeclared identifier 'AVRDUDE_FULL_VERSION' #1706 - Wrong message level in jtag3_prmsg() #1726 + - Old avrdude_message() can go away #1719 * Pull requests: - Remove 32bit MSYS2 mingw32 and clang32 build #1687 @@ -33,6 +34,7 @@ Changes since version 7.3: - Add benchmark option -b for test-avrdude #1709 - Replace msg_info() by msg_debug() in jtag3_prmsg() and jtag3_prevent() #1727 + - Remove unused avrdude_message() #1730 * Internals: