global: make 'char *path' const where possible

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index d59ae7ef9cf5f68046322178c8766eebb5f193e3..a2c0d038165cd87f09329fc75117183bfca86d24 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -53,6 +53,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;

+       ret->extra_head_content = NULL;

        ret->owner = NULL;
        ret->homepage = NULL;
        ret->section = ctx.cfg.section;
        ret->owner = NULL;
        ret->homepage = NULL;
        ret->section = ctx.cfg.section;


@@ -160,7 +161,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);

-       ref->object = parse_object(oid);
+       ref->object = parse_object(the_repository, oid);

        switch (ref->object->type) {
        case OBJ_TAG:
                ref->tag = cgit_parse_tag((struct tag *)ref->object);
        switch (ref->object->type) {
        case OBJ_TAG:
                ref->tag = cgit_parse_tag((struct tag *)ref->object);


@@ -239,7 +240,7 @@ static int load_mmfile(mmfile_t *file, const struct object_id *oid)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

-               file->ptr = read_sha1_file(oid->hash, &type,
+               file->ptr = read_object_file(oid, &type,

                                           (unsigned long *)&file->size);
        }
        return 1;
                                           (unsigned long *)&file->size);
        }
        return 1;


@@ -324,7 +325,7 @@ int cgit_diff_files(const struct object_id *old_oid,
                diff_params.flags |= XDF_IGNORE_WHITESPACE;
        emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
                diff_params.flags |= XDF_IGNORE_WHITESPACE;
        emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;

-       emit_cb.outf = filediff_cb;
+       emit_cb.out_line = filediff_cb;

        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        if (file1.size)
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        if (file1.size)


@@ -475,15 +476,16 @@ static int is_token_char(char c)
 static char *expand_macro(char *name, int maxlength)
 {
        char *value;
 static char *expand_macro(char *name, int maxlength)
 {
        char *value;

-       int len;
+       size_t len;

 
        len = 0;
        value = getenv(name);
        if (value) {
 
        len = 0;
        value = getenv(name);
        if (value) {

-               len = strlen(value);
+               len = strlen(value) + 1;

                if (len > maxlength)
                        len = maxlength;
                if (len > maxlength)
                        len = maxlength;

-               strncpy(name, value, len);
+               strlcpy(name, value, len);
+               --len;

        }
        return name + len;
 }
        }
        return name + len;
 }