author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:33:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:33:05 (UTC) |
commit | 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (patch) (unidiff) | |
tree | 93198341d83438fce50ffeda19b2510138b7b2e5 /cgit.h | |
parent | 7b5cee65fd9cf31e4f19ce4ff613778cb95512a9 (diff) | |
parent | d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (diff) | |
download | cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.zip cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.gz cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | cgit.h | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -188,56 +188,50 @@ struct cgit_snapshot_format { | |||
188 | write_archive_fn_t write_func; | 188 | write_archive_fn_t write_func; |
189 | int bit; | 189 | int bit; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | extern const char *cgit_version; | 192 | extern const char *cgit_version; |
193 | 193 | ||
194 | extern struct cgit_repolist cgit_repolist; | 194 | extern struct cgit_repolist cgit_repolist; |
195 | extern struct cgit_context ctx; | 195 | extern struct cgit_context ctx; |
196 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 196 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
197 | 197 | ||
198 | extern struct cgit_repo *cgit_add_repo(const char *url); | 198 | extern struct cgit_repo *cgit_add_repo(const char *url); |
199 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 199 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
200 | extern void cgit_repo_config_cb(const char *name, const char *value); | 200 | extern void cgit_repo_config_cb(const char *name, const char *value); |
201 | 201 | ||
202 | extern int chk_zero(int result, char *msg); | 202 | extern int chk_zero(int result, char *msg); |
203 | extern int chk_positive(int result, char *msg); | 203 | extern int chk_positive(int result, char *msg); |
204 | extern int chk_non_negative(int result, char *msg); | 204 | extern int chk_non_negative(int result, char *msg); |
205 | 205 | ||
206 | extern char *trim_end(const char *str, char c); | 206 | extern char *trim_end(const char *str, char c); |
207 | extern char *strlpart(char *txt, int maxlen); | 207 | extern char *strlpart(char *txt, int maxlen); |
208 | extern char *strrpart(char *txt, int maxlen); | 208 | extern char *strrpart(char *txt, int maxlen); |
209 | 209 | ||
210 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 210 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
211 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 211 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
212 | int flags, void *cb_data); | 212 | int flags, void *cb_data); |
213 | 213 | ||
214 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 214 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
215 | 215 | ||
216 | extern int cgit_diff_files(const unsigned char *old_sha1, | 216 | extern int cgit_diff_files(const unsigned char *old_sha1, |
217 | const unsigned char *new_sha1, | 217 | const unsigned char *new_sha1, |
218 | linediff_fn fn); | 218 | linediff_fn fn); |
219 | 219 | ||
220 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 220 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
221 | const unsigned char *new_sha1, | 221 | const unsigned char *new_sha1, |
222 | filepair_fn fn, const char *prefix); | 222 | filepair_fn fn, const char *prefix); |
223 | 223 | ||
224 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 224 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
225 | 225 | ||
226 | extern char *fmt(const char *format,...); | 226 | extern char *fmt(const char *format,...); |
227 | 227 | ||
228 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 228 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
229 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 229 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
230 | extern void cgit_parse_url(const char *url); | 230 | extern void cgit_parse_url(const char *url); |
231 | 231 | ||
232 | extern const char *cgit_repobasename(const char *reponame); | 232 | extern const char *cgit_repobasename(const char *reponame); |
233 | 233 | ||
234 | extern int cgit_parse_snapshots_mask(const char *str); | 234 | extern int cgit_parse_snapshots_mask(const char *str); |
235 | 235 | ||
236 | /* libgit.a either links against or compiles its own implementation of | ||
237 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it | ||
238 | * seems to do the trick. | ||
239 | */ | ||
240 | extern char *strcasestr(const char *haystack, const char *needle); | ||
241 | |||
242 | 236 | ||
243 | #endif /* CGIT_H */ | 237 | #endif /* CGIT_H */ |