Commit f652ec0c9ce2c00acde72d21174d13a46f822531
2020-02-13T10:43:59
no need to deep-copy the repository name from the request; just point to it
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
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index f5822e1..aada9b6 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -60,7 +60,7 @@ struct gw_trans {
struct ktemplate *gw_tmpl;
struct khtmlreq *gw_html_req;
struct kreq *gw_req;
- char *repo_name;
+ const char *repo_name;
char *repo_path;
char *commit;
char *repo_file;
@@ -152,7 +152,7 @@ static const struct kvalid gw_keys[KEY__ZMAX] = {
{ kvalid_stringne, "path" },
};
-static const struct got_error *gw_init_gw_dir(struct gw_dir **, char *);
+static const struct got_error *gw_init_gw_dir(struct gw_dir **, const char *);
static struct gw_header *gw_init_header(void);
static void gw_free_headers(struct gw_header *);
@@ -1645,8 +1645,7 @@ gw_parse_querystring(struct gw_trans *gw_trans)
return error;
} else if ((p = gw_trans->gw_req->fieldmap[KEY_PATH])) {
/* define gw_trans->repo_path */
- if (asprintf(&gw_trans->repo_name, "%s", p->parsed.s) == -1)
- return got_error_from_errno("asprintf");
+ gw_trans->repo_name = p->parsed.s;
if (asprintf(&gw_trans->repo_path, "%s/%s",
gw_trans->gw_conf->got_repos_path, p->parsed.s) == -1)
@@ -1709,7 +1708,7 @@ gw_parse_querystring(struct gw_trans *gw_trans)
}
static const struct got_error *
-gw_init_gw_dir(struct gw_dir **gw_dir, char *dir)
+gw_init_gw_dir(struct gw_dir **gw_dir, const char *dir)
{
const struct got_error *error;
@@ -4300,7 +4299,6 @@ done:
free(gw_trans->gw_conf);
free(gw_trans->commit);
free(gw_trans->repo_path);
- free(gw_trans->repo_name);
free(gw_trans->repo_file);
free(gw_trans->headref);