author | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:56:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:56:09 (UTC) |
commit | d1f3bbe9d22029f45a77bb938c176ccc0c827d46 (patch) (unidiff) | |
tree | 3f1741c012763cbc5485f31377abdd9241fbac6b /cgit.h | |
parent | b228d4ff82a65fdcd4a7364759fe36a0bdda5978 (diff) | |
download | cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.zip cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.gz cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.bz2 |
Move cgit_repo into cgit_context
This removes the global variable which is used to keep track of the
currently selected repository, and adds a new variable in the cgit_context
structure.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -45,68 +45,68 @@ | |||
45 | #define TM_MIN 60 | 45 | #define TM_MIN 60 |
46 | #define TM_HOUR (TM_MIN * 60) | 46 | #define TM_HOUR (TM_MIN * 60) |
47 | #define TM_DAY (TM_HOUR * 24) | 47 | #define TM_DAY (TM_HOUR * 24) |
48 | #define TM_WEEK (TM_DAY * 7) | 48 | #define TM_WEEK (TM_DAY * 7) |
49 | #define TM_YEAR (TM_DAY * 365) | 49 | #define TM_YEAR (TM_DAY * 365) |
50 | #define TM_MONTH (TM_YEAR / 12.0) | 50 | #define TM_MONTH (TM_YEAR / 12.0) |
51 | 51 | ||
52 | 52 | ||
53 | /* | 53 | /* |
54 | * Default encoding | 54 | * Default encoding |
55 | */ | 55 | */ |
56 | #define PAGE_ENCODING "UTF-8" | 56 | #define PAGE_ENCODING "UTF-8" |
57 | 57 | ||
58 | typedef void (*configfn)(const char *name, const char *value); | 58 | typedef void (*configfn)(const char *name, const char *value); |
59 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 59 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
60 | typedef void (*linediff_fn)(char *line, int len); | 60 | typedef void (*linediff_fn)(char *line, int len); |
61 | 61 | ||
62 | struct cacheitem { | 62 | struct cacheitem { |
63 | char *name; | 63 | char *name; |
64 | struct stat st; | 64 | struct stat st; |
65 | int ttl; | 65 | int ttl; |
66 | int fd; | 66 | int fd; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | struct repoinfo { | 69 | struct cgit_repo { |
70 | char *url; | 70 | char *url; |
71 | char *name; | 71 | char *name; |
72 | char *path; | 72 | char *path; |
73 | char *desc; | 73 | char *desc; |
74 | char *owner; | 74 | char *owner; |
75 | char *defbranch; | 75 | char *defbranch; |
76 | char *group; | 76 | char *group; |
77 | char *module_link; | 77 | char *module_link; |
78 | char *readme; | 78 | char *readme; |
79 | char *clone_url; | 79 | char *clone_url; |
80 | int snapshots; | 80 | int snapshots; |
81 | int enable_log_filecount; | 81 | int enable_log_filecount; |
82 | int enable_log_linecount; | 82 | int enable_log_linecount; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | struct repolist { | 85 | struct cgit_repolist { |
86 | int length; | 86 | int length; |
87 | int count; | 87 | int count; |
88 | struct repoinfo *repos; | 88 | struct cgit_repo *repos; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct commitinfo { | 91 | struct commitinfo { |
92 | struct commit *commit; | 92 | struct commit *commit; |
93 | char *author; | 93 | char *author; |
94 | char *author_email; | 94 | char *author_email; |
95 | unsigned long author_date; | 95 | unsigned long author_date; |
96 | char *committer; | 96 | char *committer; |
97 | char *committer_email; | 97 | char *committer_email; |
98 | unsigned long committer_date; | 98 | unsigned long committer_date; |
99 | char *subject; | 99 | char *subject; |
100 | char *msg; | 100 | char *msg; |
101 | char *msg_encoding; | 101 | char *msg_encoding; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | struct taginfo { | 104 | struct taginfo { |
105 | char *tagger; | 105 | char *tagger; |
106 | char *tagger_email; | 106 | char *tagger_email; |
107 | int tagger_date; | 107 | int tagger_date; |
108 | char *msg; | 108 | char *msg; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | struct refinfo { | 111 | struct refinfo { |
112 | const char *refname; | 112 | const char *refname; |
@@ -156,62 +156,62 @@ struct cgit_config { | |||
156 | char *virtual_root; | 156 | char *virtual_root; |
157 | int cache_dynamic_ttl; | 157 | int cache_dynamic_ttl; |
158 | int cache_max_create_time; | 158 | int cache_max_create_time; |
159 | int cache_repo_ttl; | 159 | int cache_repo_ttl; |
160 | int cache_root_ttl; | 160 | int cache_root_ttl; |
161 | int cache_static_ttl; | 161 | int cache_static_ttl; |
162 | int enable_index_links; | 162 | int enable_index_links; |
163 | int enable_log_filecount; | 163 | int enable_log_filecount; |
164 | int enable_log_linecount; | 164 | int enable_log_linecount; |
165 | int max_commit_count; | 165 | int max_commit_count; |
166 | int max_lock_attempts; | 166 | int max_lock_attempts; |
167 | int max_msg_len; | 167 | int max_msg_len; |
168 | int max_repodesc_len; | 168 | int max_repodesc_len; |
169 | int nocache; | 169 | int nocache; |
170 | int renamelimit; | 170 | int renamelimit; |
171 | int snapshots; | 171 | int snapshots; |
172 | int summary_branches; | 172 | int summary_branches; |
173 | int summary_log; | 173 | int summary_log; |
174 | int summary_tags; | 174 | int summary_tags; |
175 | }; | 175 | }; |
176 | 176 | ||
177 | struct cgit_context { | 177 | struct cgit_context { |
178 | struct cgit_query qry; | 178 | struct cgit_query qry; |
179 | struct cgit_config cfg; | 179 | struct cgit_config cfg; |
180 | struct cgit_repo *repo; | ||
180 | }; | 181 | }; |
181 | 182 | ||
182 | extern const char *cgit_version; | 183 | extern const char *cgit_version; |
183 | 184 | ||
184 | extern struct repolist cgit_repolist; | 185 | extern struct cgit_repolist cgit_repolist; |
185 | extern struct repoinfo *cgit_repo; | ||
186 | extern struct cgit_context ctx; | 186 | extern struct cgit_context ctx; |
187 | extern int cgit_cmd; | 187 | extern int cgit_cmd; |
188 | 188 | ||
189 | extern int htmlfd; | 189 | extern int htmlfd; |
190 | 190 | ||
191 | extern void cgit_prepare_context(struct cgit_context *ctx); | 191 | extern void cgit_prepare_context(struct cgit_context *ctx); |
192 | extern int cgit_get_cmd_index(const char *cmd); | 192 | extern int cgit_get_cmd_index(const char *cmd); |
193 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 193 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
194 | extern void cgit_global_config_cb(const char *name, const char *value); | 194 | extern void cgit_global_config_cb(const char *name, const char *value); |
195 | extern void cgit_repo_config_cb(const char *name, const char *value); | 195 | extern void cgit_repo_config_cb(const char *name, const char *value); |
196 | extern void cgit_querystring_cb(const char *name, const char *value); | 196 | extern void cgit_querystring_cb(const char *name, const char *value); |
197 | 197 | ||
198 | extern int chk_zero(int result, char *msg); | 198 | extern int chk_zero(int result, char *msg); |
199 | extern int chk_positive(int result, char *msg); | 199 | extern int chk_positive(int result, char *msg); |
200 | extern int chk_non_negative(int result, char *msg); | 200 | extern int chk_non_negative(int result, char *msg); |
201 | 201 | ||
202 | extern int hextoint(char c); | 202 | extern int hextoint(char c); |
203 | extern char *trim_end(const char *str, char c); | 203 | extern char *trim_end(const char *str, char c); |
204 | extern char *strlpart(char *txt, int maxlen); | 204 | extern char *strlpart(char *txt, int maxlen); |
205 | extern char *strrpart(char *txt, int maxlen); | 205 | extern char *strrpart(char *txt, int maxlen); |
206 | 206 | ||
207 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 207 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
208 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 208 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
209 | int flags, void *cb_data); | 209 | int flags, void *cb_data); |
210 | 210 | ||
211 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 211 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
212 | 212 | ||
213 | extern int cgit_diff_files(const unsigned char *old_sha1, | 213 | extern int cgit_diff_files(const unsigned char *old_sha1, |
214 | const unsigned char *new_sha1, | 214 | const unsigned char *new_sha1, |
215 | linediff_fn fn); | 215 | linediff_fn fn); |
216 | 216 | ||
217 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 217 | extern void cgit_diff_tree(const unsigned char *old_sha1, |