author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
commit | 4e75d7c9b93010663963d362099777b77a67c446 (patch) (unidiff) | |
tree | b36c95b774e31bd4bb3bcde0123d6522719b7a5a /shared.c | |
parent | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (diff) | |
parent | 41934a3222cd3e5a5f214e4275929519c70d311d (diff) | |
download | cgit-4e75d7c9b93010663963d362099777b77a67c446.zip cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.gz cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.bz2 |
Merge branch 'lh/remote-branches'
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -30,64 +30,65 @@ int chk_non_negative(int result, char *msg) | |||
30 | { | 30 | { |
31 | if (result < 0) | 31 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); | 32 | die("%s: %s",msg, strerror(errno)); |
33 | return result; | 33 | return result; |
34 | } | 34 | } |
35 | 35 | ||
36 | struct cgit_repo *cgit_add_repo(const char *url) | 36 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { | 37 | { |
38 | struct cgit_repo *ret; | 38 | struct cgit_repo *ret; |
39 | 39 | ||
40 | if (++cgit_repolist.count > cgit_repolist.length) { | 40 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) | 41 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; | 42 | cgit_repolist.length = 8; |
43 | else | 43 | else |
44 | cgit_repolist.length *= 2; | 44 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * | 46 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); | 47 | sizeof(struct cgit_repo)); |
48 | } | 48 | } |
49 | 49 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | memset(ret, 0, sizeof(struct cgit_repo)); | 51 | memset(ret, 0, sizeof(struct cgit_repo)); |
52 | ret->url = trim_end(url, '/'); | 52 | ret->url = trim_end(url, '/'); |
53 | ret->name = ret->url; | 53 | ret->name = ret->url; |
54 | ret->path = NULL; | 54 | ret->path = NULL; |
55 | ret->desc = "[no description]"; | 55 | ret->desc = "[no description]"; |
56 | ret->owner = NULL; | 56 | ret->owner = NULL; |
57 | ret->section = ctx.cfg.section; | 57 | ret->section = ctx.cfg.section; |
58 | ret->defbranch = "master"; | 58 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; | 59 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | ||
62 | ret->max_stats = ctx.cfg.max_stats; | 63 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->module_link = ctx.cfg.module_link; | 64 | ret->module_link = ctx.cfg.module_link; |
64 | ret->readme = NULL; | 65 | ret->readme = NULL; |
65 | ret->mtime = -1; | 66 | ret->mtime = -1; |
66 | ret->about_filter = ctx.cfg.about_filter; | 67 | ret->about_filter = ctx.cfg.about_filter; |
67 | ret->commit_filter = ctx.cfg.commit_filter; | 68 | ret->commit_filter = ctx.cfg.commit_filter; |
68 | ret->source_filter = ctx.cfg.source_filter; | 69 | ret->source_filter = ctx.cfg.source_filter; |
69 | return ret; | 70 | return ret; |
70 | } | 71 | } |
71 | 72 | ||
72 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 73 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
73 | { | 74 | { |
74 | int i; | 75 | int i; |
75 | struct cgit_repo *repo; | 76 | struct cgit_repo *repo; |
76 | 77 | ||
77 | for (i=0; i<cgit_repolist.count; i++) { | 78 | for (i=0; i<cgit_repolist.count; i++) { |
78 | repo = &cgit_repolist.repos[i]; | 79 | repo = &cgit_repolist.repos[i]; |
79 | if (!strcmp(repo->url, url)) | 80 | if (!strcmp(repo->url, url)) |
80 | return repo; | 81 | return repo; |
81 | } | 82 | } |
82 | return NULL; | 83 | return NULL; |
83 | } | 84 | } |
84 | 85 | ||
85 | void *cgit_free_commitinfo(struct commitinfo *info) | 86 | void *cgit_free_commitinfo(struct commitinfo *info) |
86 | { | 87 | { |
87 | free(info->author); | 88 | free(info->author); |
88 | free(info->author_email); | 89 | free(info->author_email); |
89 | free(info->committer); | 90 | free(info->committer); |
90 | free(info->committer_email); | 91 | free(info->committer_email); |
91 | free(info->subject); | 92 | free(info->subject); |
92 | free(info->msg); | 93 | free(info->msg); |
93 | free(info->msg_encoding); | 94 | free(info->msg_encoding); |