ui-refs.c: Refactor print_tag()

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 2ccf8646a5e5867632b5dcf6b2e15cbacd16f9f1..ca3034cbb1b80ad39c4339ef93eb4da821f1044b 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -18,7 +18,7 @@
 
 const char *cgit_version = CGIT_VERSION;
 
 
 const char *cgit_version = CGIT_VERSION;
 

-void add_mimetype(const char *name, const char *value)
+static void add_mimetype(const char *name, const char *value)

 {
        struct string_list_item *item;
 
 {
        struct string_list_item *item;
 


@@ -26,7 +26,7 @@ void add_mimetype(const char *name, const char *value)
        item->util = xstrdup(value);
 }
 
        item->util = xstrdup(value);
 }
 

-struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
+static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)

 {
        struct cgit_filter *f;
        int args_size = 0;
 {
        struct cgit_filter *f;
        int args_size = 0;


@@ -58,7 +58,7 @@ struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
 static void process_cached_repolist(const char *path);
 
 
 static void process_cached_repolist(const char *path);
 

-void repo_config(struct cgit_repo *repo, const char *name, const char *value)
+static void repo_config(struct cgit_repo *repo, const char *name, const char *value)

 {
        struct string_list_item *item;
 
 {
        struct string_list_item *item;
 


@@ -114,7 +114,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
        }
 }
 
        }
 }
 

-void config_cb(const char *name, const char *value)
+static void config_cb(const char *name, const char *value)

 {
        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                ctx.cfg.section = xstrdup(value);
 {
        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                ctx.cfg.section = xstrdup(value);


@@ -333,11 +333,6 @@ static void querystring_cb(const char *name, const char *value)
        }
 }
 
        }
 }
 

-char *xstrdupn(const char *str)
-{
-       return (str ? xstrdup(str) : NULL);
-}
-

 static void prepare_context(struct cgit_context *ctx)
 {
        memset(ctx, 0, sizeof(*ctx));
 static void prepare_context(struct cgit_context *ctx)
 {
        memset(ctx, 0, sizeof(*ctx));


@@ -382,16 +377,16 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.summary_tags = 10;
        ctx->cfg.max_atom_items = 10;
        ctx->cfg.ssdiff = 0;
        ctx->cfg.summary_tags = 10;
        ctx->cfg.max_atom_items = 10;
        ctx->cfg.ssdiff = 0;

-       ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
-       ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
-       ctx->env.https = xstrdupn(getenv("HTTPS"));
-       ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
-       ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
-       ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
-       ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
-       ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
-       ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
-       ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
+       ctx->env.cgit_config = getenv("CGIT_CONFIG");
+       ctx->env.http_host = getenv("HTTP_HOST");
+       ctx->env.https = getenv("HTTPS");
+       ctx->env.no_http = getenv("NO_HTTP");
+       ctx->env.path_info = getenv("PATH_INFO");
+       ctx->env.query_string = getenv("QUERY_STRING");
+       ctx->env.request_method = getenv("REQUEST_METHOD");
+       ctx->env.script_name = getenv("SCRIPT_NAME");
+       ctx->env.server_name = getenv("SERVER_NAME");
+       ctx->env.server_port = getenv("SERVER_PORT");

        ctx->page.mimetype = "text/html";
        ctx->page.charset = PAGE_ENCODING;
        ctx->page.filename = NULL;
        ctx->page.mimetype = "text/html";
        ctx->page.charset = PAGE_ENCODING;
        ctx->page.filename = NULL;


@@ -401,9 +396,9 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->page.etag = NULL;
        memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
        if (ctx->env.script_name)
        ctx->page.etag = NULL;
        memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
        if (ctx->env.script_name)

-               ctx->cfg.script_name = ctx->env.script_name;
+               ctx->cfg.script_name = xstrdup(ctx->env.script_name);

        if (ctx->env.query_string)
        if (ctx->env.query_string)

-               ctx->qry.raw = ctx->env.query_string;
+               ctx->qry.raw = xstrdup(ctx->env.query_string);

        if (!ctx->env.cgit_config)
                ctx->env.cgit_config = CGIT_CONFIG;
 }
        if (!ctx->env.cgit_config)
                ctx->env.cgit_config = CGIT_CONFIG;
 }


@@ -414,8 +409,8 @@ struct refmatch {
        int match;
 };
 
        int match;
 };
 

-int find_current_ref(const char *refname, const unsigned char *sha1,
-                    int flags, void *cb_data)
+static int find_current_ref(const char *refname, const unsigned char *sha1,
+                           int flags, void *cb_data)

 {
        struct refmatch *info;
 
 {
        struct refmatch *info;
 


@@ -427,7 +422,13 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
        return info->match;
 }
 
        return info->match;
 }
 

-char *find_default_branch(struct cgit_repo *repo)
+static void free_refmatch_inner(struct refmatch *info)
+{
+       if (info->first_ref)
+               free(info->first_ref);
+}
+
+static char *find_default_branch(struct cgit_repo *repo)

 {
        struct refmatch info;
        char *ref;
 {
        struct refmatch info;
        char *ref;


@@ -442,6 +443,8 @@ char *find_default_branch(struct cgit_repo *repo)
                ref = info.first_ref;
        if (ref)
                ref = xstrdup(ref);
                ref = info.first_ref;
        if (ref)
                ref = xstrdup(ref);

+       free_refmatch_inner(&info);
+

        return ref;
 }
 
        return ref;
 }
 


@@ -569,13 +572,13 @@ static void process_request(void *cbdata)
                cgit_print_docend();
 }
 
                cgit_print_docend();
 }
 

-int cmp_repos(const void *a, const void *b)
+static int cmp_repos(const void *a, const void *b)

 {
        const struct cgit_repo *ra = a, *rb = b;
        return strcmp(ra->url, rb->url);
 }
 
 {
        const struct cgit_repo *ra = a, *rb = b;
        return strcmp(ra->url, rb->url);
 }
 

-char *build_snapshot_setting(int bitmap)
+static char *build_snapshot_setting(int bitmap)

 {
        const struct cgit_snapshot_format *f;
        char *result = xstrdup("");
 {
        const struct cgit_snapshot_format *f;
        char *result = xstrdup("");


@@ -595,7 +598,7 @@ char *build_snapshot_setting(int bitmap)
        return result;
 }
 
        return result;
 }
 

-char *get_first_line(char *txt)
+static char *get_first_line(char *txt)

 {
        char *t = xstrdup(txt);
        char *p = strchr(t, '\n');
 {
        char *t = xstrdup(txt);
        char *p = strchr(t, '\n');


@@ -604,7 +607,7 @@ char *get_first_line(char *txt)
        return t;
 }
 
        return t;
 }
 

-void print_repo(FILE *f, struct cgit_repo *repo)
+static void print_repo(FILE *f, struct cgit_repo *repo)

 {
        fprintf(f, "repo.url=%s\n", repo->url);
        fprintf(f, "repo.name=%s\n", repo->name);
 {
        fprintf(f, "repo.url=%s\n", repo->url);
        fprintf(f, "repo.name=%s\n", repo->name);


@@ -649,7 +652,7 @@ void print_repo(FILE *f, struct cgit_repo *repo)
        fprintf(f, "\n");
 }
 
        fprintf(f, "\n");
 }
 

-void print_repolist(FILE *f, struct cgit_repolist *list, int start)
+static void print_repolist(FILE *f, struct cgit_repolist *list, int start)

 {
        int i;
 
 {
        int i;