From 500ab6a460c3236d252d188f365a4f90bb96ff48 Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Fri, 10 May 2024 18:22:57 +0100
Subject: [PATCH] Rope str_sprintf() into mmt_...() family of functions

---
 src/avrdude.h       | 1 +
 src/avrpart.c       | 4 ++--
 src/main.c          | 4 ++--
 src/serialadapter.c | 8 ++++----
 src/strutil.c       | 4 ++--
 src/update.c        | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/avrdude.h b/src/avrdude.h
index 0ee28466..336690a1 100644
--- a/src/avrdude.h
+++ b/src/avrdude.h
@@ -44,6 +44,7 @@ extern const char *pgmid;    // Programmer -c string
 #define mmt_strdup(s) cfg_strdup(__func__, s)
 #define mmt_malloc(n) cfg_malloc(__func__, n)
 #define mmt_realloc(p, n) cfg_realloc(__func__, p, n)
+#define mmt_sprintf(...) str_sprintf(__VA_ARGS__)
 #define mmt_free(p) free(p)
 
 int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int msgmode, int msglvl, const char *format, ...)
diff --git a/src/avrpart.c b/src/avrpart.c
index 779a803a..3fa0b507 100644
--- a/src/avrpart.c
+++ b/src/avrpart.c
@@ -766,7 +766,7 @@ int avr_set_config_value(const PROGRAMMER *pgm, const AVRPART *p, const char *cn
 
 
 static char *print_num(const char *fmt, int n) {
-  return str_sprintf(n<10? "%d": fmt, n);
+  return mmt_sprintf(n<10? "%d": fmt, n);
 }
 
 static int num_len(const char *fmt, int n) {
@@ -835,7 +835,7 @@ void avr_mem_display(FILE *f, const AVRPART *p, const char *prefix) {
 
     // Create mem desc string including alias if present
     AVRMEM_ALIAS *a = avr_find_memalias(p, m);
-    char *m_desc_str = str_sprintf("%s%s%s", m->desc, a? "/": "", a? a->desc: "");
+    char *m_desc_str = mmt_sprintf("%s%s%s", m->desc, a? "/": "", a? a->desc: "");
 
     // Print memory table content
     if(p->prog_modes & (PM_PDI | PM_UPDI)) {
diff --git a/src/main.c b/src/main.c
index 68e7689e..ae945bbb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -218,8 +218,8 @@ static void usage(void)
   char *home = getenv("HOME");
   size_t l = home? strlen(home): 0;
   char *cfg = home && str_casestarts(usr_config, home)?
-     str_sprintf("~/%s", usr_config+l+(usr_config[l]=='/')):
-     str_sprintf("%s", usr_config);
+     mmt_sprintf("~/%s", usr_config+l+(usr_config[l]=='/')):
+     mmt_sprintf("%s", usr_config);
 
   msg_error(
     "Usage: %s [options]\n"
diff --git a/src/serialadapter.c b/src/serialadapter.c
index 1243cfc3..4e8b5859 100644
--- a/src/serialadapter.c
+++ b/src/serialadapter.c
@@ -217,7 +217,7 @@ static char **sa_list_specs(const SERPORT *sp, int n, int i) {
       if(sa_unique_by_sea(sea, "", sp, n, i))
         Plist[Pi++] = mmt_strdup(id);
       else if(*sn && sa_unique_by_sea(sea, sn, sp, n, i))
-        Plist[Pi++] = str_sprintf("%s:%s", id, sn);
+        Plist[Pi++] = mmt_sprintf("%s:%s", id, sn);
       else if(!via && sa_num_matches_by_sea(sea, "", sp+i, 1))
         via = id;
 
@@ -232,11 +232,11 @@ static char **sa_list_specs(const SERPORT *sp, int n, int i) {
 
   if(Pi == 0 && sp[i].vid) {    // No unique serial adapter, so maybe vid:pid[:sn] works?
     if(sa_unique_by_ids(sp[i].vid, sp[i].pid, "", sp, n, i))
-      Plist[Pi++] = str_sprintf("usb:%04x:%04x", sp[i].vid, sp[i].pid);
+      Plist[Pi++] = mmt_sprintf("usb:%04x:%04x", sp[i].vid, sp[i].pid);
     else if(*sn && sa_unique_by_ids(sp[i].vid, sp[i].pid, sn, sp, n, i))
-      Plist[Pi++] = str_sprintf("usb:%04x:%04x:%s", sp[i].vid, sp[i].pid, sn);
+      Plist[Pi++] = mmt_sprintf("usb:%04x:%04x:%s", sp[i].vid, sp[i].pid, sn);
     else if(via && Pi == 0)
-      Plist[Pi++] = str_sprintf("(via %s serial adapter)", via);
+      Plist[Pi++] = mmt_sprintf("(via %s serial adapter)", via);
   }
 
   Plist[Pi] = NULL;
diff --git a/src/strutil.c b/src/strutil.c
index 26110862..f05f9461 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -570,7 +570,7 @@ unsigned long long int str_ull(const char *str, char **endptr, int base) {
  */
 
 #define Return(...) do { \
-  sd->errstr = str_sprintf(__VA_ARGS__); \
+  sd->errstr = mmt_sprintf(__VA_ARGS__); \
   sd->type = 0; \
   mmt_free(str); \
   return sd; \
@@ -579,7 +579,7 @@ unsigned long long int str_ull(const char *str, char **endptr, int base) {
 #define Warning(...) do { \
   if(sd->warnstr) \
     mmt_free(sd->warnstr); \
-   sd->warnstr = str_sprintf(__VA_ARGS__); \
+   sd->warnstr = mmt_sprintf(__VA_ARGS__); \
 } while (0)
 
 #define sizeforsigned(ll) ( \
diff --git a/src/update.c b/src/update.c
index 91554918..8a0e09f2 100644
--- a/src/update.c
+++ b/src/update.c
@@ -133,9 +133,9 @@ void free_update(UPDATE *u) {
 
 char *update_str(const UPDATE *upd) {
   if(upd->cmdline)
-    return str_sprintf("-%c %s",
+    return mmt_sprintf("-%c %s",
       str_eq("interactive terminal", upd->cmdline)? 't': 'T', upd->cmdline);
-  return str_sprintf("-U %s:%c:%s:%c",
+  return mmt_sprintf("-U %s:%c:%s:%c",
     upd->memstr,
     upd->op == DEVICE_READ? 'r': upd->op == DEVICE_WRITE? 'w': 'v',
     upd->filename,