ui-plain.c: Use a context structure in walk_tree()

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 11edd81cbb69d5b3eab7fe0cdc0c720fea05d951..ade85ea0976640c49ce71e8a718e5f5c2d7978ac 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -315,7 +315,7 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);

-       } else if (!strcmp(name, "s")){
+       } else if (!strcmp(name, "s")) {

                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
                ctx.qry.showmsg = atoi(value);
                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
                ctx.qry.showmsg = atoi(value);


@@ -450,7 +450,7 @@ static char *guess_defbranch(const char *repo_path)
        const char *ref;
        unsigned char sha1[20];
 
        const char *ref;
        unsigned char sha1[20];
 

-       ref = resolve_ref("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);

        if (!ref || prefixcmp(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);
        if (!ref || prefixcmp(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);


@@ -653,7 +653,7 @@ void print_repolist(FILE *f, struct cgit_repolist *list, int start)
 {
        int i;
 
 {
        int i;
 

-       for(i = start; i < list->count; i++)
+       for (i = start; i < list->count; i++)

                print_repo(f, &list->repos[i]);
 }
 
                print_repo(f, &list->repos[i]);
 }
 


@@ -741,7 +741,7 @@ static void cgit_parse_args(int argc, const char **argv)
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {

-                       ctx.cfg.cache_root = xstrdup(argv[i]+8);
+                       ctx.cfg.cache_root = xstrdup(argv[i] + 8);

                }
                if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
                }
                if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;


@@ -750,24 +750,24 @@ static void cgit_parse_args(int argc, const char **argv)
                        ctx.env.no_http = "1";
                }
                if (!strncmp(argv[i], "--query=", 8)) {
                        ctx.env.no_http = "1";
                }
                if (!strncmp(argv[i], "--query=", 8)) {

-                       ctx.qry.raw = xstrdup(argv[i]+8);
+                       ctx.qry.raw = xstrdup(argv[i] + 8);

                }
                if (!strncmp(argv[i], "--repo=", 7)) {
                }
                if (!strncmp(argv[i], "--repo=", 7)) {

-                       ctx.qry.repo = xstrdup(argv[i]+7);
+                       ctx.qry.repo = xstrdup(argv[i] + 7);

                }
                if (!strncmp(argv[i], "--page=", 7)) {
                }
                if (!strncmp(argv[i], "--page=", 7)) {

-                       ctx.qry.page = xstrdup(argv[i]+7);
+                       ctx.qry.page = xstrdup(argv[i] + 7);

                }
                if (!strncmp(argv[i], "--head=", 7)) {
                }
                if (!strncmp(argv[i], "--head=", 7)) {

-                       ctx.qry.head = xstrdup(argv[i]+7);
+                       ctx.qry.head = xstrdup(argv[i] + 7);

                        ctx.qry.has_symref = 1;
                }
                if (!strncmp(argv[i], "--sha1=", 7)) {
                        ctx.qry.has_symref = 1;
                }
                if (!strncmp(argv[i], "--sha1=", 7)) {

-                       ctx.qry.sha1 = xstrdup(argv[i]+7);
+                       ctx.qry.sha1 = xstrdup(argv[i] + 7);

                        ctx.qry.has_sha1 = 1;
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.has_sha1 = 1;
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {

-                       ctx.qry.ofs = atoi(argv[i]+6);
+                       ctx.qry.ofs = atoi(argv[i] + 6);

                }
                if (!strncmp(argv[i], "--scan-tree=", 12) ||
                    !strncmp(argv[i], "--scan-path=", 12)) {
                }
                if (!strncmp(argv[i], "--scan-tree=", 12) ||
                    !strncmp(argv[i], "--scan-path=", 12)) {


@@ -834,7 +834,7 @@ int main(int argc, const char **argv)
                ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
                if (!ctx.cfg.virtual_root)
                        ctx.cfg.virtual_root = "";
                ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
                if (!ctx.cfg.virtual_root)
                        ctx.cfg.virtual_root = "";

-        }
+       }

 
        /* If no url parameter is specified on the querystring, lets
         * use PATH_INFO as url. This allows cgit to work with virtual
 
        /* If no url parameter is specified on the querystring, lets
         * use PATH_INFO as url. This allows cgit to work with virtual


@@ -856,7 +856,7 @@ int main(int argc, const char **argv)
        }
 
        ttl = calc_ttl();
        }
 
        ttl = calc_ttl();

-       ctx.page.expires += ttl*60;
+       ctx.page.expires += ttl * 60;

        if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
                ctx.cfg.nocache = 1;
        if (ctx.cfg.nocache)
        if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
                ctx.cfg.nocache = 1;
        if (ctx.cfg.nocache)