Merge branch 'wip'

18 files changed, 125 insertions, 111 deletions

diff --git a/cache.c b/cache.c
index 47cdcb4..3127fc2 100644
--- a/cache.c
+++ b/cache.c
@@ -363,7 +363,7 @@ int cache_process(int size, const char *path, const char *key, int ttl,
 /* Return a strftime formatted date/time
  * NB: the result from this function is to shared memory
  */
-char *sprintftime(const char *format, time_t time)
+static char *sprintftime(const char *format, time_t time)
 {
         static char buf[64];
         struct tm *tm;
diff --git a/cgit.c b/cgit.c
index 2ccf864..afafcce 100644
--- a/cgit.c
+++ b/cgit.c
@@ -18,7 +18,7 @@
 
 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;
 
@@ -26,7 +26,7 @@ void add_mimetype(const char *name, const char *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;
@@ -58,7 +58,7 @@ struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
 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;
 
@@ -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);
@@ -333,7 +333,7 @@ static void querystring_cb(const char *name, const char *value)
         }
 }
 
-char *xstrdupn(const char *str)
+static char *xstrdupn(const char *str)
 {
         return (str ? xstrdup(str) : NULL);
 }
@@ -414,8 +414,8 @@ struct refmatch {
         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;
 
@@ -427,7 +427,13 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
         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;
@@ -442,6 +448,8 @@ char *find_default_branch(struct cgit_repo *repo)
                 ref = info.first_ref;
         if (ref)
                 ref = xstrdup(ref);
+        free_refmatch_inner(&info);
+
         return ref;
 }
 
@@ -569,13 +577,13 @@ static void process_request(void *cbdata)
                 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);
 }
 
-char *build_snapshot_setting(int bitmap)
+static char *build_snapshot_setting(int bitmap)
 {
         const struct cgit_snapshot_format *f;
         char *result = xstrdup("");
@@ -595,7 +603,7 @@ char *build_snapshot_setting(int bitmap)
         return result;
 }
 
-char *get_first_line(char *txt)
+static char *get_first_line(char *txt)
 {
         char *t = xstrdup(txt);
         char *p = strchr(t, '\n');
@@ -604,7 +612,7 @@ char *get_first_line(char *txt)
         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);
@@ -649,7 +657,7 @@ void print_repo(FILE *f, struct cgit_repo *repo)
         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;
 
diff --git a/cgit.h b/cgit.h
index c655bd8..ed5cf14 100644
--- a/cgit.h
+++ b/cgit.h
@@ -304,6 +304,7 @@ extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
+extern void cgit_free_reflist_inner(struct reflist *list);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data);
 
diff --git a/configfile.c b/configfile.c
index 3fa217f..d98989c 100644
--- a/configfile.c
+++ b/configfile.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "configfile.h"
 
-int next_char(FILE *f)
+static int next_char(FILE *f)
 {
         int c = fgetc(f);
         if (c == '\r') {
@@ -23,7 +23,7 @@ int next_char(FILE *f)
         return c;
 }
 
-void skip_line(FILE *f)
+static void skip_line(FILE *f)
 {
         int c;
 
@@ -31,7 +31,7 @@ void skip_line(FILE *f)
                 ;
 }
 
-int read_config_line(FILE *f, char *line, const char **value, int bufsize)
+static int read_config_line(FILE *f, char *line, const char **value, int bufsize)
 {
         int i = 0, isname = 0;
 
diff --git a/html.c b/html.c
index 90cc1c0..b5c6903 100644
--- a/html.c
+++ b/html.c
@@ -39,7 +39,7 @@ static const char* url_escape_table[256] = {
         "%fe", "%ff"
 };
 
-int htmlfd = STDOUT_FILENO;
+static int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
 {
@@ -266,7 +266,7 @@ int html_include(const char *filename)
         return 0;
 }
 
-int hextoint(char c)
+static int hextoint(char c)
 {
         if (c >= 'a' && c <= 'f')
                 return 10 + c - 'a';
@@ -278,7 +278,7 @@ int hextoint(char c)
                 return -1;
 }
 
-char *convert_query_hexchar(char *txt)
+static char *convert_query_hexchar(char *txt)
 {
         int d1, d2, n;
         n = strlen(txt);
diff --git a/parsing.c b/parsing.c
index 9b7efb3..658621d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -52,7 +52,7 @@ void cgit_parse_url(const char *url)
         }
 }
 
-char *substr(const char *head, const char *tail)
+static char *substr(const char *head, const char *tail)
 {
         char *buf;
 
@@ -64,7 +64,7 @@ char *substr(const char *head, const char *tail)
         return buf;
 }
 
-char *parse_user(char *t, char **name, char **email, unsigned long *date)
+static char *parse_user(char *t, char **name, char **email, unsigned long *date)
 {
         char *p = t;
         int mode = 1;
@@ -101,7 +101,7 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 #ifdef NO_ICONV
 #define reencode(a, b, c)
 #else
-const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
+static const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
         char *tmp;
 
diff --git a/shared.c b/shared.c
index e732064..cc06930 100644
--- a/shared.c
+++ b/shared.c
@@ -158,7 +158,7 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
         list->refs[list->count++] = ref;
 }
 
-struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
 {
         struct refinfo *ref;
 
@@ -176,6 +176,42 @@ struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
         return ref;
 }
 
+static void cgit_free_taginfo(struct taginfo *tag)
+{
+        if (tag->tagger)
+                free(tag->tagger);
+        if (tag->tagger_email)
+                free(tag->tagger_email);
+        if (tag->msg)
+                free(tag->msg);
+        free(tag);
+}
+
+static void cgit_free_refinfo(struct refinfo *ref)
+{
+        if (ref->refname)
+                free((char *)ref->refname);
+        switch (ref->object->type) {
+        case OBJ_TAG:
+                cgit_free_taginfo(ref->tag);
+                break;
+        case OBJ_COMMIT:
+                cgit_free_commitinfo(ref->commit);
+                break;
+        }
+        free(ref);
+}
+
+void cgit_free_reflist_inner(struct reflist *list)
+{
+        int i;
+
+        for (i = 0; i < list->count; i++) {
+                cgit_free_refinfo(list->refs[i]);
+        }
+        free(list->refs);
+}
+
 int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
                   void *cb_data)
 {
@@ -187,8 +223,8 @@ int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
         return 0;
 }
 
-void cgit_diff_tree_cb(struct diff_queue_struct *q,
-                       struct diff_options *options, void *data)
+static void cgit_diff_tree_cb(struct diff_queue_struct *q,
+                              struct diff_options *options, void *data)
 {
         int i;
 
@@ -224,7 +260,7 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
 char *diffbuf = NULL;
 int buflen = 0;
 
-int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
+static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 {
         int i;
 
@@ -461,14 +497,14 @@ int readfile(const char *path, char **buf, size_t *size)
         return (*size == st.st_size ? 0 : e);
 }
 
-int is_token_char(char c)
+static int is_token_char(char c)
 {
         return isalnum(c) || c == '_';
 }
 
 /* Replace name with getenv(name), return pointer to zero-terminating char
  */
-char *expand_macro(char *name, int maxlength)
+static char *expand_macro(char *name, int maxlength)
 {
         char *value;
         int len;
diff --git a/ui-atom.c b/ui-atom.c
index b218456..5b5525d 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -10,7 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 
-void add_entry(struct commit *commit, char *host)
+static void add_entry(struct commit *commit, char *host)
 {
         char delim = '&';
         char *hex;
diff --git a/ui-commit.c b/ui-commit.c
index 74f37c8..0783285 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -74,6 +74,7 @@ void cgit_print_commit(char *hex, const char *prefix)