Mark several functions/variables static

Spotted by parsing the output of `gcc -Wmissing-prototypes [...]`.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-03-04 08:52:33 +01:00 committed by Jason A. Donenfeld
parent d5a43b429a
commit bafab423f2
14 changed files with 64 additions and 60 deletions

View File

@ -363,7 +363,7 @@ int cache_process(int size, const char *path, const char *key, int ttl,
/* Return a strftime formatted date/time /* Return a strftime formatted date/time
* NB: the result from this function is to shared memory * 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]; static char buf[64];
struct tm *tm; struct tm *tm;

24
cgit.c
View File

@ -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; struct cgit_filter *f;
int args_size = 0; 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")) if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
ctx.cfg.section = xstrdup(value); 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); return (str ? xstrdup(str) : NULL);
} }
@ -414,7 +414,7 @@ struct refmatch {
int match; int match;
}; };
int find_current_ref(const char *refname, const unsigned char *sha1, static int find_current_ref(const char *refname, const unsigned char *sha1,
int flags, void *cb_data) int flags, void *cb_data)
{ {
struct refmatch *info; struct refmatch *info;
@ -427,7 +427,7 @@ 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 char *find_default_branch(struct cgit_repo *repo)
{ {
struct refmatch info; struct refmatch info;
char *ref; char *ref;
@ -569,13 +569,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; const struct cgit_repo *ra = a, *rb = b;
return strcmp(ra->url, rb->url); 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; const struct cgit_snapshot_format *f;
char *result = xstrdup(""); char *result = xstrdup("");
@ -595,7 +595,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 *t = xstrdup(txt);
char *p = strchr(t, '\n'); char *p = strchr(t, '\n');
@ -604,7 +604,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.url=%s\n", repo->url);
fprintf(f, "repo.name=%s\n", repo->name); fprintf(f, "repo.name=%s\n", repo->name);
@ -649,7 +649,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;

View File

@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include "configfile.h" #include "configfile.h"
int next_char(FILE *f) static int next_char(FILE *f)
{ {
int c = fgetc(f); int c = fgetc(f);
if (c == '\r') { if (c == '\r') {
@ -23,7 +23,7 @@ int next_char(FILE *f)
return c; return c;
} }
void skip_line(FILE *f) static void skip_line(FILE *f)
{ {
int c; 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; int i = 0, isname = 0;

6
html.c
View File

@ -39,7 +39,7 @@ static const char* url_escape_table[256] = {
"%fe", "%ff" "%fe", "%ff"
}; };
int htmlfd = STDOUT_FILENO; static int htmlfd = STDOUT_FILENO;
char *fmt(const char *format, ...) char *fmt(const char *format, ...)
{ {
@ -266,7 +266,7 @@ int html_include(const char *filename)
return 0; return 0;
} }
int hextoint(char c) static int hextoint(char c)
{ {
if (c >= 'a' && c <= 'f') if (c >= 'a' && c <= 'f')
return 10 + c - 'a'; return 10 + c - 'a';
@ -278,7 +278,7 @@ int hextoint(char c)
return -1; return -1;
} }
char *convert_query_hexchar(char *txt) static char *convert_query_hexchar(char *txt)
{ {
int d1, d2, n; int d1, d2, n;
n = strlen(txt); n = strlen(txt);

View File

@ -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; char *buf;
@ -64,7 +64,7 @@ char *substr(const char *head, const char *tail)
return buf; 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; char *p = t;
int mode = 1; int mode = 1;
@ -101,7 +101,7 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
#ifdef NO_ICONV #ifdef NO_ICONV
#define reencode(a, b, c) #define reencode(a, b, c)
#else #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; char *tmp;

View File

@ -158,7 +158,7 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
list->refs[list->count++] = 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; struct refinfo *ref;
@ -187,7 +187,7 @@ int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
return 0; return 0;
} }
void cgit_diff_tree_cb(struct diff_queue_struct *q, static void cgit_diff_tree_cb(struct diff_queue_struct *q,
struct diff_options *options, void *data) struct diff_options *options, void *data)
{ {
int i; int i;
@ -224,7 +224,7 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
char *diffbuf = NULL; char *diffbuf = NULL;
int buflen = 0; 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; int i;
@ -461,14 +461,14 @@ int readfile(const char *path, char **buf, size_t *size)
return (*size == st.st_size ? 0 : e); return (*size == st.st_size ? 0 : e);
} }
int is_token_char(char c) static int is_token_char(char c)
{ {
return isalnum(c) || c == '_'; return isalnum(c) || c == '_';
} }
/* Replace name with getenv(name), return pointer to zero-terminating char /* 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; char *value;
int len; int len;

View File

@ -10,7 +10,7 @@
#include "html.h" #include "html.h"
#include "ui-shared.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 delim = '&';
char *hex; char *hex;

View File

@ -166,8 +166,9 @@ static void inspect_filepair(struct diff_filepair *pair)
total_rems += lines_removed; total_rems += lines_removed;
} }
void cgit_print_diffstat(const unsigned char *old_sha1, static void cgit_print_diffstat(const unsigned char *old_sha1,
const unsigned char *new_sha1, const char *prefix) const unsigned char *new_sha1,
const char *prefix)
{ {
int i; int i;

View File

@ -28,7 +28,7 @@ static const char *column_colors_html[] = {
#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
void count_lines(char *line, int size) static void count_lines(char *line, int size)
{ {
if (size <= 0) if (size <= 0)
return; return;
@ -40,7 +40,7 @@ void count_lines(char *line, int size)
rem_lines++; rem_lines++;
} }
void inspect_files(struct diff_filepair *pair) static void inspect_files(struct diff_filepair *pair)
{ {
unsigned long old_size = 0; unsigned long old_size = 0;
unsigned long new_size = 0; unsigned long new_size = 0;
@ -95,7 +95,7 @@ next:
} }
} }
void print_commit(struct commit *commit, struct rev_info *revs) static void print_commit(struct commit *commit, struct rev_info *revs)
{ {
struct commitinfo *info; struct commitinfo *info;
int cols = revs->graph ? 3 : 2; int cols = revs->graph ? 3 : 2;

View File

@ -12,7 +12,7 @@
#include "ui-shared.h" #include "ui-shared.h"
#include <strings.h> #include <strings.h>
time_t read_agefile(char *path) static time_t read_agefile(char *path)
{ {
time_t result; time_t result;
size_t size; size_t size;
@ -76,7 +76,7 @@ static void print_modtime(struct cgit_repo *repo)
cgit_print_age(t, -1, NULL); cgit_print_age(t, -1, NULL);
} }
int is_match(struct cgit_repo *repo) static int is_match(struct cgit_repo *repo)
{ {
if (!ctx.qry.search) if (!ctx.qry.search)
return 1; return 1;
@ -91,7 +91,7 @@ int is_match(struct cgit_repo *repo)
return 0; return 0;
} }
int is_in_url(struct cgit_repo *repo) static int is_in_url(struct cgit_repo *repo)
{ {
if (!ctx.qry.url) if (!ctx.qry.url)
return 1; return 1;
@ -100,7 +100,7 @@ int is_in_url(struct cgit_repo *repo)
return 0; return 0;
} }
void print_sort_header(const char *title, const char *sort) static void print_sort_header(const char *title, const char *sort)
{ {
htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort); htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
if (ctx.qry.search) { if (ctx.qry.search) {
@ -110,7 +110,7 @@ void print_sort_header(const char *title, const char *sort)
htmlf("'>%s</a></th>", title); htmlf("'>%s</a></th>", title);
} }
void print_header() static void print_header()
{ {
html("<tr class='nohover'>"); html("<tr class='nohover'>");
print_sort_header("Name", "name"); print_sort_header("Name", "name");
@ -124,7 +124,7 @@ void print_header()
} }
void print_pager(int items, int pagelen, char *search, char *sort) static void print_pager(int items, int pagelen, char *search, char *sort)
{ {
int i, ofs; int i, ofs;
char *class = NULL; char *class = NULL;
@ -223,7 +223,7 @@ struct sortcolumn sortcolumn[] = {
{NULL, NULL} {NULL, NULL}
}; };
int sort_repolist(char *field) static int sort_repolist(char *field)
{ {
struct sortcolumn *column; struct sortcolumn *column;

View File

@ -121,7 +121,7 @@ const char *cgit_repobasename(const char *reponame)
return rvbuf; return rvbuf;
} }
char *cgit_currurl() static char *cgit_currurl()
{ {
if (!ctx.cfg.virtual_root) if (!ctx.cfg.virtual_root)
return ctx.cfg.script_name; return ctx.cfg.script_name;
@ -433,7 +433,7 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
reporevlink("stats", name, title, class, head, NULL, path); reporevlink("stats", name, title, class, head, NULL, path);
} }
void cgit_self_link(char *name, const char *title, const char *class, static void cgit_self_link(char *name, const char *title, const char *class,
struct cgit_context *ctx) struct cgit_context *ctx)
{ {
if (!strcmp(ctx->qry.page, "repolist")) if (!strcmp(ctx->qry.page, "repolist"))
@ -512,7 +512,7 @@ void cgit_object_link(struct object *obj)
reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
} }
struct string_list_item *lookup_path(struct string_list *list, static struct string_list_item *lookup_path(struct string_list *list,
const char *path) const char *path)
{ {
struct string_list_item *item; struct string_list_item *item;
@ -716,7 +716,7 @@ void cgit_print_docend()
html("</body>\n</html>\n"); html("</body>\n</html>\n");
} }
int print_branch_option(const char *refname, const unsigned char *sha1, static int print_branch_option(const char *refname, const unsigned char *sha1,
int flags, void *cb_data) int flags, void *cb_data)
{ {
char *name = (char *)refname; char *name = (char *)refname;
@ -724,7 +724,7 @@ int print_branch_option(const char *refname, const unsigned char *sha1,
return 0; return 0;
} }
int print_archive_ref(const char *refname, const unsigned char *sha1, static int print_archive_ref(const char *refname, const unsigned char *sha1,
int flags, void *cb_data) int flags, void *cb_data)
{ {
struct tag *tag; struct tag *tag;

View File

@ -153,7 +153,7 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
return NULL; return NULL;
} }
void show_error(char *msg) static void show_error(char *msg)
{ {
ctx.page.mimetype = "text/html"; ctx.page.mimetype = "text/html";
cgit_print_http_headers(&ctx); cgit_print_http_headers(&ctx);

View File

@ -211,7 +211,7 @@ static int cmp_total_commits(const void *a1, const void *a2)
/* Walk the commit DAG and collect number of commits per author per /* Walk the commit DAG and collect number of commits per author per
* timeperiod into a nested string_list collection. * timeperiod into a nested string_list collection.
*/ */
struct string_list collect_stats(struct cgit_context *ctx, static struct string_list collect_stats(struct cgit_context *ctx,
struct cgit_period *period) struct cgit_period *period)
{ {
struct string_list authors; struct string_list authors;
@ -253,9 +253,12 @@ struct string_list collect_stats(struct cgit_context *ctx,
return authors; return authors;
} }
void print_combined_authorrow(struct string_list *authors, int from, int to, static void print_combined_authorrow(struct string_list *authors, int from,
const char *name, const char *leftclass, const char *centerclass, int to, const char *name,
const char *rightclass, struct cgit_period *period) const char *leftclass,
const char *centerclass,
const char *rightclass,
struct cgit_period *period)
{ {
struct string_list_item *author; struct string_list_item *author;
struct authorstat *authorstat; struct authorstat *authorstat;
@ -293,7 +296,7 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
htmlf("<td class='%s'>%ld</td></tr>", rightclass, total); htmlf("<td class='%s'>%ld</td></tr>", rightclass, total);
} }
void print_authors(struct string_list *authors, int top, static void print_authors(struct string_list *authors, int top,
struct cgit_period *period) struct cgit_period *period)
{ {
struct string_list_item *author; struct string_list_item *author;

View File

@ -30,7 +30,7 @@ static void print_tag_content(char *buf)
} }
} }
void print_download_links(char *revname) static void print_download_links(char *revname)
{ {
html("<tr><th>download</th><td class='sha1'>"); html("<tr><th>download</th><td class='sha1'>");
cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,