Rename xmsprintf() to just xmprintf().

Partly because there's no supplied target string ala sprintf, and partly
because I can never remember what order the m and s go in.

4 files changed, 4 insertions, 4 deletions

diff --git a/toys/lsb/mktemp.c b/toys/lsb/mktemp.c
index 86c2033e..c1175fec 100644
--- a/toys/lsb/mktemp.c
+++ b/toys/lsb/mktemp.c
@@ -38,7 +38,7 @@ void mktemp_main(void)
     if (!TT.tmpdir) TT.tmpdir = "/tmp";
     tmp = "tmp.xxxxxx";
   }
-  if (TT.tmpdir) tmp = xmsprintf("%s/%s", TT.tmpdir ? TT.tmpdir : "/tmp",
+  if (TT.tmpdir) tmp = xmprintf("%s/%s", TT.tmpdir ? TT.tmpdir : "/tmp",
     *toys.optargs ? *toys.optargs : "tmp.XXXXXX");
 
   if (d_flag ? mkdtemp(tmp) == NULL : mkstemp(tmp) == -1)
diff --git a/toys/lsb/passwd.c b/toys/lsb/passwd.c
index f3338361..c92fb0d7 100644
--- a/toys/lsb/passwd.c
+++ b/toys/lsb/passwd.c
@@ -160,7 +160,7 @@ void passwd_main(void)
   } else if (toys.optflags & FLAG_l) {
     if (pass[0] == '!') error_exit("password is already locked for %s",name);
     printf("Locking password for %s\n",name);
-    encrypted = xmsprintf("!%s",pass);
+    encrypted = xmprintf("!%s",pass);
   } else if (toys.optflags & FLAG_u) {
     if (pass[0] != '!') error_exit("password is already unlocked for %s",name);
 
diff --git a/toys/lsb/su.c b/toys/lsb/su.c
index 04b0dc1d..a92705c5 100644
--- a/toys/lsb/su.c
+++ b/toys/lsb/su.c
@@ -33,7 +33,7 @@ static char *snapshot_env(char *name)
 {
   char *s = getenv(name);
 
-  if (s) return xmsprintf("%s=%s", name, s);
+  if (s) return xmprintf("%s=%s", name, s);
 
   return 0;
 }
diff --git a/toys/lsb/umount.c b/toys/lsb/umount.c
index bcc1fff1..cc40f144 100644
--- a/toys/lsb/umount.c
+++ b/toys/lsb/umount.c
@@ -57,7 +57,7 @@ void comma_collate(char **old, char *new)
     char *comma = ",";
 
     if (atold[strlen(atold)-1] == ',') comma = "";
-    temp = xmsprintf("%s%s%s", atold, comma, new);
+    temp = xmprintf("%s%s%s", atold, comma, new);
   } else temp = xstrdup(new);
   free (atold);
   *old = temp;