X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=help.c;h=46a784eb04d6817a469cdd9507536bfdadebb6cf;hp=8a47c3f4c16e2d0bacc8206ada933ae91d3e7c3b;hb=db28a17d552a0f73cb2cb34f46389a691522265c;hpb=eb115f7cd8f64bb5bfe95c98e10bf8ab845f9e47 diff --git a/help.c b/help.c index 8a47c3f..46a784e 100644 --- a/help.c +++ b/help.c @@ -49,7 +49,7 @@ static void logcore(int sysloglevel, const char *fmt, ...) { void logv(int sysloglevel, const char *pfx, int errnoval, const char *fmt, va_list al) { - char msgbuf[1024]; /* NB do not call xvasprintf here or you'll recurse */ + char msgbuf[1024]; /* NB do not call mvasprintf here or you'll recurse */ vsnprintf(msgbuf,sizeof(msgbuf), fmt,al); msgbuf[sizeof(msgbuf)-1]= 0; @@ -97,16 +97,16 @@ DEFLOG(dbg, "debug", LOG_DEBUG, -1) /*========== utility functions etc. ==========*/ -char *xvasprintf(const char *fmt, va_list al) { +char *mvasprintf(const char *fmt, va_list al) { char *str; int rc= vasprintf(&str,fmt,al); if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt); return str; } -char *xasprintf(const char *fmt, ...) { +char *masprintf(const char *fmt, ...) { VA; - char *str= xvasprintf(fmt,al); + char *str= mvasprintf(fmt,al); va_end(al); return str; }