Commit f7632464f6a882703db22388191980263411fb14
2020-04-14T17:40:42
remove all asprintf from gw_tags
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index 6df005b..28cdc50 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -1657,15 +1657,13 @@ gw_tags(struct gw_trans *gw_trans)
}
if (gw_trans->page > 0 && gw_trans->prev_id) {
- if (asprintf(&href_prev,
- "?path=%s&page=%d&action=tags&commit=%s&prev=%s",
- gw_trans->repo_name, gw_trans->page - 1,
- gw_trans->prev_id ? gw_trans->prev_id : "",
- gw_trans->prev_prev_id ?
- gw_trans->prev_prev_id : "") == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
+ href_prev = khttp_urlpartx(NULL, NULL, "gotweb", "path",
+ KATTRX_STRING, gw_trans->repo_name, "page",
+ KATTRX_INT, (int64_t) (gw_trans->page - 1), "action",
+ KATTRX_STRING, "tags", "commit", KATTRX_STRING,
+ gw_trans->prev_id ? gw_trans->prev_id : "", "prev",
+ KATTRX_STRING, gw_trans->prev_prev_id ?
+ gw_trans->prev_prev_id : "", NULL);
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
KATTR_HREF, href_prev, KATTR__MAX);
if (kerr != KCGI_OK)
@@ -1689,17 +1687,14 @@ gw_tags(struct gw_trans *gw_trans)
KATTR_ID, "nav_next", KATTR__MAX);
if (kerr != KCGI_OK)
goto done;
- if (asprintf(&href_next,
- "?path=%s&page=%d&action=tags" \
- "&commit=%s&prev=%s&prev_prev=%s",
- gw_trans->repo_name, gw_trans->page + 1,
- gw_trans->next_id,
+ href_next = khttp_urlpartx(NULL, NULL, "gotweb", "path",
+ KATTRX_STRING, gw_trans->repo_name, "page",
+ KATTRX_INT, (int64_t) (gw_trans->page + 1), "action",
+ KATTRX_STRING, "tags", "commit", KATTRX_STRING,
+ gw_trans->next_id, "prev", KATTRX_STRING,
gw_trans->next_prev_id ? gw_trans->next_prev_id : "",
- gw_trans->prev_id ?
- gw_trans->prev_id : "") == -1) {
- error = got_error_from_errno("calloc");
- goto done;
- }
+ "prev_prev", KATTRX_STRING, gw_trans->prev_id ?
+ gw_trans->prev_id : "", NULL);
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
KATTR_HREF, href_next, KATTR__MAX);
if (kerr != KCGI_OK)