3 files changed, 4 insertions, 63 deletions

diff --git a/cgit.h b/cgit.h
index 7619cbb..7581cc1 100644
--- a/cgit.h
+++ b/cgit.h
@@ -327,9 +327,6 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
 __attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
-__attribute__((format (printf,1,2)))
-extern char *fmtalloc(const char *format,...);
-
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
diff --git a/html.c b/html.c
index f7772dc..8c45ba6 100644
--- a/html.c
+++ b/html.c
@@ -63,18 +63,6 @@ char *fmt(const char *format, ...)
 	return buf[bufidx];
 }
 
-char *fmtalloc(const char *format, ...)
-{
-	struct strbuf sb = STRBUF_INIT;
-	va_list args;
-
-	va_start(args, format);
-	strbuf_vaddf(&sb, format, args);
-	va_end(args);
-
-	return strbuf_detach(&sb, NULL);
-}
-
 void html_raw(const char *data, size_t size)
 {
 	if (write(htmlfd, data, size) != size)
@@ -88,35 +76,13 @@ void html(const char *txt)
 
 void htmlf(const char *format, ...)
 {
-	va_list args;
-	struct strbuf buf = STRBUF_INIT;
-
-	va_start(args, format);
-	strbuf_vaddf(&buf, format, args);
-	va_end(args);
-	html(buf.buf);
-	strbuf_release(&buf);
-}
-
-void html_txtf(const char *format, ...)
-{
+	static char buf[65536];
 	va_list args;
 
 	va_start(args, format);
-	html_vtxtf(format, args);
+	vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
-}
-
-void html_vtxtf(const char *format, va_list ap)
-{
-	va_list cp;
-	struct strbuf buf = STRBUF_INIT;
-
-	va_copy(cp, ap);
-	strbuf_vaddf(&buf, format, cp);
-	va_end(cp);
-	html_txt(buf.buf);
-	strbuf_release(&buf);
+	html(buf);
 }
 
 void html_status(int code, const char *msg, int more_headers)
@@ -170,19 +136,6 @@ void html_ntxt(int len, const char *txt)
 		html("...");
 }
 
-void html_attrf(const char *fmt, ...)
-{
-	va_list ap;
-	struct strbuf sb = STRBUF_INIT;
-
-	va_start(ap, fmt);
-	strbuf_vaddf(&sb, fmt, ap);
-	va_end(ap);
-
-	html_attr(sb.buf);
-	strbuf_release(&sb);
-}
-
 void html_attr(const char *txt)
 {
 	const char *t = txt;
diff --git a/html.h b/html.h
index be3b311..bb36f37 100644
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
 #ifndef HTML_H
 #define HTML_H
 
-#include "cgit.h"
+#include <stddef.h>
 
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
@@ -9,15 +9,6 @@ extern void html(const char *txt);
 __attribute__((format (printf,1,2)))
 extern void htmlf(const char *format,...);
 
-__attribute__((format (printf,1,2)))
-extern void html_txtf(const char *format,...);
-
-__attribute__((format (printf,1,0)))
-extern void html_vtxtf(const char *format, va_list ap);
-
-__attribute__((format (printf,1,2)))
-extern void html_attrf(const char *format,...);
-
 extern void html_status(int code, const char *msg, int more_headers);
 extern void html_txt(const char *txt);
 extern void html_ntxt(int len, const char *txt);