commit 12003b6a72fbdc20ec40693e5d4d6933c5455e47 from: Tracey Emery date: Tue Apr 14 17:40:42 2020 UTC remove all asprintf from gw_output_repo_tags commit - f7632464f6a882703db22388191980263411fb14 commit + 12003b6a72fbdc20ec40693e5d4d6933c5455e47 blob - 28cdc5020b28d2809c7b1881d5b59701cdda3ad7 blob + 3bcfcd1c8227020bfa99725fdb0daace5c4d55e6 --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -3073,11 +3073,10 @@ gw_output_repo_tags(struct gw_trans *gw_trans, struct KATTR_ID, "tag_name", KATTR__MAX); if (kerr != KCGI_OK) goto done; - if (asprintf(&href_tag, "?path=%s&action=tag&commit=%s", - gw_trans->repo_name, id_str) == -1) { - error = got_error_from_errno("asprintf"); - goto done; - } + + href_tag = khttp_urlpart(NULL, NULL, "gotweb", "path", + gw_trans->repo_name, "action", "tag", "commit", + id_str, NULL); kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A, KATTR_HREF, href_tag, KATTR__MAX); if (kerr != KCGI_OK) @@ -3111,13 +3110,11 @@ gw_output_repo_tags(struct gw_trans *gw_trans, struct kerr = khtml_puts(gw_trans->gw_html_req, " | "); if (kerr != KCGI_OK) - goto done; - if (asprintf(&href_briefs, - "?path=%s&action=briefs&commit=%s", - gw_trans->repo_name, id_str) == -1) { - error = got_error_from_errno("asprintf"); goto done; - } + + href_briefs = khttp_urlpart(NULL, NULL, "gotweb", + "path", gw_trans->repo_name, "action", "briefs", + "commit", id_str, NULL); kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A, KATTR_HREF, href_briefs, KATTR__MAX); if (kerr != KCGI_OK) @@ -3134,12 +3131,9 @@ gw_output_repo_tags(struct gw_trans *gw_trans, struct if (kerr != KCGI_OK) goto done; - if (asprintf(&href_commits, - "?path=%s&action=commits&commit=%s", - gw_trans->repo_name, id_str) == -1) { - error = got_error_from_errno("asprintf"); - goto done; - } + href_commits = khttp_urlpart(NULL, NULL, "gotweb", + "path", gw_trans->repo_name, "action", "commits", + "commit", id_str, NULL); kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A, KATTR_HREF, href_commits, KATTR__MAX); if (kerr != KCGI_OK)