From 59d85e2bb065a3bdc27868acb7a65f89d872c7fa Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 16 Jan 2014 09:26:50 -0600
Subject: 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.
---
lib/lib.h | 2 +-
lib/password.c | 4 ++--
lib/xwrap.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'lib')
diff --git a/lib/lib.h b/lib/lib.h
index d052880e..be940185 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -83,7 +83,7 @@ void *xzalloc(size_t size);
void *xrealloc(void *ptr, size_t size);
char *xstrndup(char *s, size_t n);
char *xstrdup(char *s);
-char *xmsprintf(char *format, ...);
+char *xmprintf(char *format, ...);
void xprintf(char *format, ...);
void xputs(char *s);
void xputc(char c);
diff --git a/lib/password.c b/lib/password.c
index e184e0e0..f2d010ec 100644
--- a/lib/password.c
+++ b/lib/password.c
@@ -129,7 +129,7 @@ int update_password(char *filename, char* username, char* entry)
struct flock lock;
shadow = strstr(filename, "shadow");
- filenamesfx = xmsprintf("%s+", filename);
+ filenamesfx = xmprintf("%s+", filename);
sfx = strchr(filenamesfx, '+');
exfp = fopen(filename, "r+");
@@ -163,7 +163,7 @@ int update_password(char *filename, char* username, char* entry)
}
ret = 0;
- namesfx = xmsprintf("%s:",username);
+ namesfx = xmprintf("%s:",username);
while ((line = get_line(fileno(exfp))) != NULL)
{
if (strncmp(line, namesfx, strlen(namesfx)))
diff --git a/lib/xwrap.c b/lib/xwrap.c
index ae296cd6..2ecffaad 100644
--- a/lib/xwrap.c
+++ b/lib/xwrap.c
@@ -66,7 +66,7 @@ char *xstrdup(char *s)
}
// Die unless we can allocate enough space to sprintf() into.
-char *xmsprintf(char *format, ...)
+char *xmprintf(char *format, ...)
{
va_list va, va2;
int len;
--
cgit v1.2.3