Commit b5f0780096f443734de8fc503ca92bf737e2a7b2
2020-01-28T19:42:10
remove got_www_path which is not actually used
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 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index 060b7e0..eb93230 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -2756,7 +2756,6 @@ done:
}
if (gw_malloc) {
free(gw_trans->gw_conf->got_repos_path);
- free(gw_trans->gw_conf->got_www_path);
free(gw_trans->gw_conf->got_site_name);
free(gw_trans->gw_conf->got_site_owner);
free(gw_trans->gw_conf->got_site_link);
diff --git a/gotweb/gotweb.conf.5 b/gotweb/gotweb.conf.5
index f31730a..d3cfc24 100644
--- a/gotweb/gotweb.conf.5
+++ b/gotweb/gotweb.conf.5
@@ -80,8 +80,6 @@ Set the displayed site name title.
Set the displayed site owner.
.It Ic got_show_site_owner Ar on | off
Toggle display of the site owner.
-.It Ic got_www_path Ar string
-Set the public gotweb httpd path.
.El
.Sh EXAMPLES
These are the currently configurable items for Gotweb.
@@ -94,7 +92,6 @@ The configuration file gotweb.conf must be located at /var/www/etc/gotweb.conf.
#
got_repos_path "/got/public"
-got_www_path "/gotweb"
#got_max_repos 100
#got_max_repos_display 25
diff --git a/gotweb/gotweb.h b/gotweb/gotweb.h
index 664f273..499f3cb 100644
--- a/gotweb/gotweb.h
+++ b/gotweb/gotweb.h
@@ -51,7 +51,6 @@
struct gotweb_conf {
char *got_repos_path;
- char *got_www_path;
char *got_site_name;
char *got_site_owner;
char *got_site_link;
diff --git a/gotweb/parse.y b/gotweb/parse.y
index c3ab529..2271bbd 100644
--- a/gotweb/parse.y
+++ b/gotweb/parse.y
@@ -108,10 +108,6 @@ main : GOT_REPOS_PATH STRING {
if ((gw_conf->got_repos_path = strdup($2)) == NULL)
errx(1, "out of memory");
}
- | GOT_WWW_PATH STRING {
- if ((gw_conf->got_www_path = strdup($2)) == NULL)
- errx(1, "out of memory");
- }
| GOT_MAX_REPOS NUMBER {
if ($2 > 0)
gw_conf->got_max_repos = $2;
@@ -211,7 +207,6 @@ lookup(char *s)
{ "got_site_link", GOT_SITE_LINK },
{ "got_site_name", GOT_SITE_NAME },
{ "got_site_owner", GOT_SITE_OWNER },
- { "got_www_path", GOT_WWW_PATH },
};
const struct keywords *p;
@@ -490,8 +485,6 @@ parse_conf(const char *filename, struct gotweb_conf *gconf)
gw_conf = gconf;
if ((gw_conf->got_repos_path = strdup(D_GOTPATH)) == NULL)
err(1, "strdup");
- if ((gw_conf->got_www_path = strdup(D_GOTWWW)) == NULL)
- err(1, "strdup");
if ((gw_conf->got_site_name = strdup(D_SITENAME)) == NULL)
err(1, "strdup");
if ((gw_conf->got_site_owner = strdup(D_SITEOWNER)) == NULL)