commit 6c7f10f7250c7b1cb44cc9490bec065ad0107d24 from: Omar Polo via: Thomas Adam date: Wed Nov 23 17:07:20 2022 UTC gotwebd: drop unused path parameter from got_get_repo_{owner,age} ok jamsek commit - 24240f6a1c027ee762d62f20165a6b8d5ed88980 commit + 6c7f10f7250c7b1cb44cc9490bec065ad0107d24 blob - 9238f92bb4af244b34cfd23e0764816063474c74 blob + 720ddf7a23a10f5f33bb11b3c77f9932477b30f5 --- gotwebd/got_operations.c +++ gotwebd/got_operations.c @@ -108,7 +108,7 @@ got_gotweb_dupfd(int *priv_fd, int *fd) } const struct got_error * -got_get_repo_owner(char **owner, struct request *c, char *dir) +got_get_repo_owner(char **owner, struct request *c) { struct server *srv = c->srv; struct transport *t = c->t; @@ -134,7 +134,7 @@ got_get_repo_owner(char **owner, struct request *c, ch } const struct got_error * -got_get_repo_age(char **repo_age, struct request *c, char *dir, +got_get_repo_age(char **repo_age, struct request *c, const char *refname, int ref_tm) { const struct got_error *error = NULL; blob - 9e3bcc0a991339c88b7b72e28a8fad769b0145f8 blob + 9a945a4f551877621c21213d3e00fb7b28392106 --- gotwebd/gotweb.c +++ gotwebd/gotweb.c @@ -1545,8 +1545,7 @@ gotweb_render_branches(struct request *c) if (strncmp(refname, "refs/heads/", 11) != 0) continue; - error = got_get_repo_age(&age, c, qs->path, refname, - TM_DIFF); + error = got_get_repo_age(&age, c, refname, TM_DIFF); if (error) goto done; @@ -2431,7 +2430,6 @@ done: goto err; } - repo = find_cached_repo(srv, repo_dir->path); if (repo == NULL) { error = cache_repo(&repo, srv, repo_dir, sock); @@ -2443,11 +2441,10 @@ done: repo_dir->path); if (error) goto err; - error = got_get_repo_owner(&repo_dir->owner, c, repo_dir->path); + error = got_get_repo_owner(&repo_dir->owner, c); if (error) goto err; - error = got_get_repo_age(&repo_dir->age, c, repo_dir->path, - NULL, TM_DIFF); + error = got_get_repo_age(&repo_dir->age, c, NULL, TM_DIFF); if (error) goto err; error = gotweb_get_clone_url(&repo_dir->url, srv, repo_dir->path); blob - a8a55276acbd0b209205938c75b88d6918b1c6b8 blob + 0a9217f7fb5cc2256686d1d01c59b69e5f96d4ad --- gotwebd/gotwebd.h +++ gotwebd/gotwebd.h @@ -455,8 +455,8 @@ int fcgi_printf(struct request *, const char *, ...) int fcgi_gen_binary_response(struct request *, const uint8_t *, int); /* got_operations.c */ -const struct got_error *got_get_repo_owner(char **, struct request *, char *); -const struct got_error *got_get_repo_age(char **, struct request *, char *, +const struct got_error *got_get_repo_owner(char **, struct request *); +const struct got_error *got_get_repo_age(char **, struct request *, const char *, int); const struct got_error *got_get_repo_commits(struct request *, int); const struct got_error *got_get_repo_tags(struct request *, int);