Mark char* fields in struct cgit_page as const

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 77a302d0c5bba8a54c29a6551b15cea6f02c9205..c1f3c202c90592d49874c46a8b6a2a3da9c749be 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "ui-shared.h"
 #include "cmd.h"
 #include "html.h"
 
@@ -34,7 +35,7 @@ void cgit_print_error(const char *msg)
        html("</div>\n");
 }
 
-char *cgit_httpscheme()
+const char *cgit_httpscheme()
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";
@@ -42,7 +43,7 @@ char *cgit_httpscheme()
                return "http://";
 }
 
-char *cgit_hosturl()
+const char *cgit_hosturl()
 {
        if (ctx.env.http_host)
                return ctx.env.http_host;
@@ -53,10 +54,10 @@ char *cgit_hosturl()
        return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
 }
 
-char *cgit_rooturl()
+const char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
-               return fmt("%s/", ctx.cfg.virtual_root);
+               return ctx.cfg.virtual_root;
        else
                return ctx.cfg.script_name;
 }
@@ -64,7 +65,7 @@ char *cgit_rooturl()
 char *cgit_repourl(const char *reponame)
 {
        if (ctx.cfg.virtual_root) {
-               return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
+               return fmt("%s%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
@@ -77,7 +78,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        char *delim;
 
        if (ctx.cfg.virtual_root) {
-               tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
+               tmp = fmt("%s%s/%s/%s", ctx.cfg.virtual_root, reponame,
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
@@ -125,11 +126,9 @@ static void site_url(const char *page, const char *search, const char *sort, int
 {
        char *delim = "?";
 
-       if (ctx.cfg.virtual_root) {
+       if (ctx.cfg.virtual_root)
                html_attr(ctx.cfg.virtual_root);
-               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
-                       html("/");
-       } else
+       else
                html(ctx.cfg.script_name);
 
        if (page) {
@@ -200,8 +199,6 @@ static char *repolink(const char *title, const char *class, const char *page,
        html(" href='");
        if (ctx.cfg.virtual_root) {
                html_url_path(ctx.cfg.virtual_root);
-               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
-                       html("/");
                html_url_path(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
@@ -425,58 +422,59 @@ static void cgit_self_link(char *name, const char *title, const char *class,
                           struct cgit_context *ctx)
 {
        if (!strcmp(ctx->qry.page, "repolist"))
-               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
-                                      ctx->qry.ofs);
+               cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
+                               ctx->qry.ofs);
        else if (!strcmp(ctx->qry.page, "summary"))
-               return cgit_summary_link(name, title, class, ctx->qry.head);
+               cgit_summary_link(name, title, class, ctx->qry.head);
        else if (!strcmp(ctx->qry.page, "tag"))
-               return cgit_tag_link(name, title, class, ctx->qry.head,
-                                    ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+               cgit_tag_link(name, title, class, ctx->qry.head,
+                             ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
        else if (!strcmp(ctx->qry.page, "tree"))
-               return cgit_tree_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_tree_link(name, title, class, ctx->qry.head,
+                              ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                              ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "plain"))
-               return cgit_plain_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_plain_link(name, title, class, ctx->qry.head,
+                               ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                               ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "log"))
-               return cgit_log_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, ctx->qry.ofs,
-                                     ctx->qry.grep, ctx->qry.search,
-                                     ctx->qry.showmsg);
+               cgit_log_link(name, title, class, ctx->qry.head,
+                             ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                             ctx->qry.path, ctx->qry.ofs,
+                             ctx->qry.grep, ctx->qry.search,
+                             ctx->qry.showmsg);
        else if (!strcmp(ctx->qry.page, "commit"))
-               return cgit_commit_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, 0);
+               cgit_commit_link(name, title, class, ctx->qry.head,
+                                ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                ctx->qry.path, 0);
        else if (!strcmp(ctx->qry.page, "patch"))
-               return cgit_patch_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_patch_link(name, title, class, ctx->qry.head,
+                               ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                               ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "refs"))
-               return cgit_refs_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_refs_link(name, title, class, ctx->qry.head,
+                              ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                              ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "snapshot"))
-               return cgit_snapshot_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                  ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                  ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "diff"))
-               return cgit_diff_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.sha1, ctx->qry.sha2,
-                                     ctx->qry.path, 0);
+               cgit_diff_link(name, title, class, ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.sha2,
+                              ctx->qry.path, 0);
        else if (!strcmp(ctx->qry.page, "stats"))
-               return cgit_stats_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.path);
-
-       /* Don't known how to make link for this page */
-       repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
-       html("><!-- cgit_self_link() doesn't know how to make link for page '");
-       html_txt(ctx->qry.page);
-       html("' -->");
-       html_txt(name);
-       html("</a>");
+               cgit_stats_link(name, title, class, ctx->qry.head,
+                               ctx->qry.path);
+       else {
+               /* Don't known how to make link for this page */
+               repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+               html("><!-- cgit_self_link() doesn't know how to make link for page '");
+               html_txt(ctx->qry.page);
+               html("' -->");
+               html_txt(name);
+               html("</a>");
+       }
 }
 
 void cgit_object_link(struct object *obj)
@@ -522,6 +520,7 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
        char tail, *dir;
        size_t len;
 
+       len = 0;
        tail = 0;
        list = &ctx.repo->submodules;
        item = lookup_path(list, path);
@@ -649,7 +648,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
                return;
        }
 
-       char *host = cgit_hosturl();
+       const char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
@@ -931,4 +930,5 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }
+       free(prefix);
 }