X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=strbuf.h;h=fa07ecf094bd3ef8997958fde29199f8fb6421b9;hb=628511a5883fa809e86b34ebc147ac62eb214458;hp=89bd36e15a541e268117ff023afc6a43137cdd6e;hpb=96aa7adda3b0254e4b9904f53bb38cd76bfea7bb;p=git.git diff --git a/strbuf.h b/strbuf.h index 89bd36e15..fa07ecf09 100644 --- a/strbuf.h +++ b/strbuf.h @@ -11,7 +11,7 @@ * build complex strings/buffers whose final size isn't easily known. * * It is NOT legal to copy the ->buf pointer away. - * `strbuf_detach' is the operation that detachs a buffer from its shell + * `strbuf_detach' is the operation that detaches a buffer from its shell * while keeping the shell valid wrt its invariants. * * 2. the ->buf member is a byte array that has at least ->len + 1 bytes @@ -117,7 +117,7 @@ struct strbuf_expand_dict_entry { }; extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context); -__attribute__((format(printf,2,3))) +__attribute__((format (printf,2,3))) extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...); extern size_t strbuf_fread(struct strbuf *, size_t, FILE *); @@ -126,9 +126,13 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint); extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint); extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint); +extern int strbuf_getwholeline(struct strbuf *, FILE *, int); extern int strbuf_getline(struct strbuf *, FILE *, int); extern void stripspace(struct strbuf *buf, int skip_comments); extern int launch_editor(const char *path, struct strbuf *buffer, const char *const *env); +extern int strbuf_branchname(struct strbuf *sb, const char *name); +extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name); + #endif /* STRBUF_H */