cgit.c: remove useless null check

[ps-cgit] / ui-clone.c

diff --git a/ui-clone.c b/ui-clone.c
index 9d0d6ad5f7cee475ba97445e2eaf5d0d0f6e4c09..f7b0b047963c6192430f4c9580734f61c083c123 100644 (file)
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -12,15 +12,15 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-static int print_ref_info(const char *refname, const unsigned char *sha1,
+static int print_ref_info(const char *refname, const struct object_id *oid,

                           int flags, void *cb_data)
 {
        struct object *obj;
 
                           int flags, void *cb_data)
 {
        struct object *obj;
 

-       if (!(obj = parse_object(sha1)))
+       if (!(obj = parse_object(oid->hash)))

                return 0;
 
                return 0;
 

-       htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
+       htmlf("%s\t%s\n", oid_to_hex(oid), refname);

        if (obj->type == OBJ_TAG) {
                if (!(obj = deref_tag(obj, refname, 0)))
                        return 0;
        if (obj->type == OBJ_TAG) {
                if (!(obj = deref_tag(obj, refname, 0)))
                        return 0;


@@ -29,73 +29,81 @@ static int print_ref_info(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 

-static void print_pack_info(struct cgit_context *ctx)
+static void print_pack_info(void)

 {
        struct packed_git *pack;
 {
        struct packed_git *pack;

-       int ofs;
+       char *offset;

 
 

-       ctx->page.mimetype = "text/plain";
-       ctx->page.filename = "objects/info/packs";
-       cgit_print_http_headers(ctx);
-       ofs = strlen(ctx->repo->path) + strlen("/objects/pack/");
+       ctx.page.mimetype = "text/plain";
+       ctx.page.filename = "objects/info/packs";
+       cgit_print_http_headers();

        prepare_packed_git();
        prepare_packed_git();

-       for (pack = packed_git; pack; pack = pack->next)
-               if (pack->pack_local)
-                       htmlf("P %s\n", pack->pack_name + ofs);
+       for (pack = packed_git; pack; pack = pack->next) {
+               if (pack->pack_local) {
+                       offset = strrchr(pack->pack_name, '/');
+                       if (offset && offset[1] != '\0')
+                               ++offset;
+                       else
+                               offset = pack->pack_name;
+                       htmlf("P %s\n", offset);
+               }
+       }

 }
 
 }
 

-static void send_file(struct cgit_context *ctx, char *path)
+static void send_file(const char *path)

 {
        struct stat st;
 
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:
 {
        struct stat st;
 
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:

-                       html_status(404, "Not found", 0);
+                       cgit_print_error_page(404, "Not found", "Not found");

                        break;
                case EACCES:
                        break;
                case EACCES:

-                       html_status(403, "Forbidden", 0);
+                       cgit_print_error_page(403, "Forbidden", "Forbidden");

                        break;
                default:
                        break;
                default:

-                       html_status(400, "Bad request", 0);
+                       cgit_print_error_page(400, "Bad request", "Bad request");

                }
                return;
        }
                }
                return;
        }

-       ctx->page.mimetype = "application/octet-stream";
-       ctx->page.filename = path;
-       if (prefixcmp(ctx->repo->path, path))
-               ctx->page.filename += strlen(ctx->repo->path) + 1;
-       cgit_print_http_headers(ctx);
+       ctx.page.mimetype = "application/octet-stream";
+       ctx.page.filename = path;
+       skip_prefix(path, ctx.repo->path, &ctx.page.filename);
+       skip_prefix(ctx.page.filename, "/", &ctx.page.filename);
+       cgit_print_http_headers();

        html_include(path);
 }
 
        html_include(path);
 }
 

-void cgit_clone_info(struct cgit_context *ctx)
+void cgit_clone_info(void)

 {
 {

-       if (!ctx->qry.path || strcmp(ctx->qry.path, "refs"))
+       if (!ctx.qry.path || strcmp(ctx.qry.path, "refs")) {
+               cgit_print_error_page(400, "Bad request", "Bad request");

                return;
                return;

+       }

 
 

-       ctx->page.mimetype = "text/plain";
-       ctx->page.filename = "info/refs";
-       cgit_print_http_headers(ctx);
-       for_each_ref(print_ref_info, ctx);
+       ctx.page.mimetype = "text/plain";
+       ctx.page.filename = "info/refs";
+       cgit_print_http_headers();
+       for_each_ref(print_ref_info, NULL);

 }
 
 }
 

-void cgit_clone_objects(struct cgit_context *ctx)
+void cgit_clone_objects(void)

 {
 {

-       if (!ctx->qry.path) {
-               html_status(400, "Bad request", 0);
+       if (!ctx.qry.path) {
+               cgit_print_error_page(400, "Bad request", "Bad request");

                return;
        }
 
                return;
        }
 

-       if (!strcmp(ctx->qry.path, "info/packs")) {
-               print_pack_info(ctx);
+       if (!strcmp(ctx.qry.path, "info/packs")) {
+               print_pack_info();

                return;
        }
 
                return;
        }
 

-       send_file(ctx, git_path("objects/%s", ctx->qry.path));
+       send_file(git_path("objects/%s", ctx.qry.path));

 }
 
 }
 

-void cgit_clone_head(struct cgit_context *ctx)
+void cgit_clone_head(void)

 {
 {

-       send_file(ctx, git_path("%s", "HEAD"));
+       send_file(git_path("%s", "HEAD"));

 }
 }