author | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
commit | a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806 (patch) (unidiff) | |
tree | de8271ebfabd244437cd68021c8af86391afb9bd /cgit.h | |
parent | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (diff) | |
parent | d187b98557d91b874836f286b955ba76ab26fb02 (diff) | |
download | cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.zip cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.gz cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.bz2 |
Merge branch 'ml/bugfix'
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -234,82 +234,83 @@ struct cgit_page { | |||
234 | struct cgit_environment { | 234 | struct cgit_environment { |
235 | char *cgit_config; | 235 | char *cgit_config; |
236 | char *http_host; | 236 | char *http_host; |
237 | char *https; | 237 | char *https; |
238 | char *no_http; | 238 | char *no_http; |
239 | char *path_info; | 239 | char *path_info; |
240 | char *query_string; | 240 | char *query_string; |
241 | char *request_method; | 241 | char *request_method; |
242 | char *script_name; | 242 | char *script_name; |
243 | char *server_name; | 243 | char *server_name; |
244 | char *server_port; | 244 | char *server_port; |
245 | }; | 245 | }; |
246 | 246 | ||
247 | struct cgit_context { | 247 | struct cgit_context { |
248 | struct cgit_environment env; | 248 | struct cgit_environment env; |
249 | struct cgit_query qry; | 249 | struct cgit_query qry; |
250 | struct cgit_config cfg; | 250 | struct cgit_config cfg; |
251 | struct cgit_repo *repo; | 251 | struct cgit_repo *repo; |
252 | struct cgit_page page; | 252 | struct cgit_page page; |
253 | }; | 253 | }; |
254 | 254 | ||
255 | struct cgit_snapshot_format { | 255 | struct cgit_snapshot_format { |
256 | const char *suffix; | 256 | const char *suffix; |
257 | const char *mimetype; | 257 | const char *mimetype; |
258 | write_archive_fn_t write_func; | 258 | write_archive_fn_t write_func; |
259 | int bit; | 259 | int bit; |
260 | }; | 260 | }; |
261 | 261 | ||
262 | extern const char *cgit_version; | 262 | extern const char *cgit_version; |
263 | 263 | ||
264 | extern struct cgit_repolist cgit_repolist; | 264 | extern struct cgit_repolist cgit_repolist; |
265 | extern struct cgit_context ctx; | 265 | extern struct cgit_context ctx; |
266 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 266 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
267 | 267 | ||
268 | extern struct cgit_repo *cgit_add_repo(const char *url); | 268 | extern struct cgit_repo *cgit_add_repo(const char *url); |
269 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 269 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
270 | extern void cgit_repo_config_cb(const char *name, const char *value); | 270 | extern void cgit_repo_config_cb(const char *name, const char *value); |
271 | 271 | ||
272 | extern int chk_zero(int result, char *msg); | 272 | extern int chk_zero(int result, char *msg); |
273 | extern int chk_positive(int result, char *msg); | 273 | extern int chk_positive(int result, char *msg); |
274 | extern int chk_non_negative(int result, char *msg); | 274 | extern int chk_non_negative(int result, char *msg); |
275 | 275 | ||
276 | extern char *trim_end(const char *str, char c); | 276 | extern char *trim_end(const char *str, char c); |
277 | extern char *strlpart(char *txt, int maxlen); | 277 | extern char *strlpart(char *txt, int maxlen); |
278 | extern char *strrpart(char *txt, int maxlen); | 278 | extern char *strrpart(char *txt, int maxlen); |
279 | 279 | ||
280 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 280 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
281 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 281 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
282 | int flags, void *cb_data); | 282 | int flags, void *cb_data); |
283 | 283 | ||
284 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 284 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
285 | 285 | ||
286 | extern int cgit_diff_files(const unsigned char *old_sha1, | 286 | extern int cgit_diff_files(const unsigned char *old_sha1, |
287 | const unsigned char *new_sha1, | 287 | const unsigned char *new_sha1, |
288 | unsigned long *old_size, unsigned long *new_size, | 288 | unsigned long *old_size, unsigned long *new_size, |
289 | int *binary, int context, int ignorews, | 289 | int *binary, int context, int ignorews, |
290 | linediff_fn fn); | 290 | linediff_fn fn); |
291 | 291 | ||
292 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 292 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
293 | const unsigned char *new_sha1, | 293 | const unsigned char *new_sha1, |
294 | filepair_fn fn, const char *prefix, int ignorews); | 294 | filepair_fn fn, const char *prefix, int ignorews); |
295 | 295 | ||
296 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 296 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
297 | 297 | ||
298 | __attribute__((format (printf,1,2))) | ||
298 | extern char *fmt(const char *format,...); | 299 | extern char *fmt(const char *format,...); |
299 | 300 | ||
300 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 301 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
301 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 302 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
302 | extern void cgit_parse_url(const char *url); | 303 | extern void cgit_parse_url(const char *url); |
303 | 304 | ||
304 | extern const char *cgit_repobasename(const char *reponame); | 305 | extern const char *cgit_repobasename(const char *reponame); |
305 | 306 | ||
306 | extern int cgit_parse_snapshots_mask(const char *str); | 307 | extern int cgit_parse_snapshots_mask(const char *str); |
307 | 308 | ||
308 | extern int cgit_open_filter(struct cgit_filter *filter); | 309 | extern int cgit_open_filter(struct cgit_filter *filter); |
309 | extern int cgit_close_filter(struct cgit_filter *filter); | 310 | extern int cgit_close_filter(struct cgit_filter *filter); |
310 | 311 | ||
311 | extern int readfile(const char *path, char **buf, size_t *size); | 312 | extern int readfile(const char *path, char **buf, size_t *size); |
312 | 313 | ||
313 | extern char *expand_macros(const char *txt); | 314 | extern char *expand_macros(const char *txt); |
314 | 315 | ||
315 | #endif /* CGIT_H */ | 316 | #endif /* CGIT_H */ |