Allocate formatted strings with git's xstrfmt

1 file changed, 7 insertions, 7 deletions

diff --git a/source/ui-shared.c b/source/ui-shared.cindex b2b7245..7c198ea 100644--- a/source/ui-shared.c+++ b/source/ui-shared.c@@ -674,7 +674,7 @@ char *cgit_hosturl(void) 		return NULL; 	if (!ctx.env.server_port || atoi(ctx.env.server_port) == DEFAULT_HTTP_PORT) 		return xstrdup(ctx.env.server_name);-	return cgit_fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);+	return xstrfmt("%s:%s", ctx.env.server_name, ctx.env.server_port); }  char *cgit_currenturl(void)@@ -684,8 +684,8 @@ char *cgit_currenturl(void) 	if (!ctx.qry.url) 		return xstrdup(root); 	if (root[0] && root[strlen(root) - 1] == '/')-		return cgit_fmtalloc("%s%s", root, ctx.qry.url);-	return cgit_fmtalloc("%s/%s", root, ctx.qry.url);+		return xstrfmt("%s%s", root, ctx.qry.url);+	return xstrfmt("%s/%s", root, ctx.qry.url); }  char *cgit_currentquery(void)@@ -722,7 +722,7 @@ char *cgit_currentfullurl(void) { 	char *url = cgit_currenturl(); 	char *query = cgit_currentquery();-	char *ret = cgit_fmtalloc("%s%s", url, query);+	char *ret = xstrfmt("%s%s", url, query);  	free(url); 	free(query);@@ -734,7 +734,7 @@ const char *cgit_loginurl(void) 	static const char *login_url;  	if (!login_url)-		login_url = cgit_fmtalloc("%s?p=login", ctx.cfg.virtual_root);+		login_url = xstrfmt("%s?p=login", ctx.cfg.virtual_root); 	return login_url; } @@ -1089,7 +1089,7 @@ static void gitmodules_link(const char *path, const char *rev, char **module,  	target = repo_serving_url(url); 	if (target) {-		char *query = cgit_fmtalloc("id=%s", rev);+		char *query = xstrfmt("id=%s", rev);  		*module = cgit_pageurl(target->url, "tree", query); 		*commit = cgit_pageurl(target->url, "commit", query);@@ -1858,6 +1858,6 @@ void cgit_set_title_from_path(const char *path)  void cgit_prefix_title(const char *name) {-	ctx.page.title = cgit_fmtalloc("%s - %s", name,+	ctx.page.title = xstrfmt("%s - %s", name, 		ctx.page.title ? ctx.page.title : ctx.cfg.root_title); }
diff --git a/source/ui-shared.c b/source/ui-shared.c
index b2b7245..7c198ea 100644
--- a/source/ui-shared.c
+++ b/source/ui-shared.c
@@ -674,7 +674,7 @@ char *cgit_hosturl(void)
 		return NULL;
 	if (!ctx.env.server_port || atoi(ctx.env.server_port) == DEFAULT_HTTP_PORT)
 		return xstrdup(ctx.env.server_name);
-	return cgit_fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
+	return xstrfmt("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
 char *cgit_currenturl(void)
@@ -684,8 +684,8 @@ char *cgit_currenturl(void)
 	if (!ctx.qry.url)
 		return xstrdup(root);
 	if (root[0] && root[strlen(root) - 1] == '/')
-		return cgit_fmtalloc("%s%s", root, ctx.qry.url);
-	return cgit_fmtalloc("%s/%s", root, ctx.qry.url);
+		return xstrfmt("%s%s", root, ctx.qry.url);
+	return xstrfmt("%s/%s", root, ctx.qry.url);
 }
 
 char *cgit_currentquery(void)
@@ -722,7 +722,7 @@ char *cgit_currentfullurl(void)
 {
 	char *url = cgit_currenturl();
 	char *query = cgit_currentquery();
-	char *ret = cgit_fmtalloc("%s%s", url, query);
+	char *ret = xstrfmt("%s%s", url, query);
 
 	free(url);
 	free(query);
@@ -734,7 +734,7 @@ const char *cgit_loginurl(void)
 	static const char *login_url;
 
 	if (!login_url)
-		login_url = cgit_fmtalloc("%s?p=login", ctx.cfg.virtual_root);
+		login_url = xstrfmt("%s?p=login", ctx.cfg.virtual_root);
 	return login_url;
 }
 
@@ -1089,7 +1089,7 @@ static void gitmodules_link(const char *path, const char *rev, char **module,
 
 	target = repo_serving_url(url);
 	if (target) {
-		char *query = cgit_fmtalloc("id=%s", rev);
+		char *query = xstrfmt("id=%s", rev);
 
 		*module = cgit_pageurl(target->url, "tree", query);
 		*commit = cgit_pageurl(target->url, "commit", query);
@@ -1858,6 +1858,6 @@ void cgit_set_title_from_path(const char *path)
 
 void cgit_prefix_title(const char *name)
 {
-	ctx.page.title = cgit_fmtalloc("%s - %s", name,
+	ctx.page.title = xstrfmt("%s - %s", name,
 		ctx.page.title ? ctx.page.title : ctx.cfg.root_title);
 }