mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-config-param'

Browse Source 
* jk/maint-config-param:
  config: use strbuf_split_str instead of a temporary strbuf
  strbuf: allow strbuf_split to work on non-strbufs
  config: avoid segfault when parsing command-line config
  config: die on error in command-line config
  fix "git -c" parsing of values with equals signs
  strbuf_split: add a max parameter
This commit is contained in:
Junio C Hamano
2011-07-19 09:45:21 -07:00
parent 20a80d04a4 f77bccaeba
commit fe01ef31b7
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
strbuf.h
View File

@ -44,7 +44,22 @@ extern void strbuf_rtrim(struct strbuf *);
extern void strbuf_ltrim(struct strbuf *);
extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);
extern struct strbuf **strbuf_split(const struct strbuf *, int delim);
extern struct strbuf **strbuf_split_buf(const char *, size_t,
int delim, int max);
static inline struct strbuf **strbuf_split_str(const char *str,
int delim, int max)
{
return strbuf_split_buf(str, strlen(str), delim, max);
}
static inline struct strbuf **strbuf_split_max(const struct strbuf *sb,
int delim, int max)
{
return strbuf_split_buf(sb->buf, sb->len, delim, max);
}
static inline struct strbuf **strbuf_split(const struct strbuf *sb, int delim)
{
return strbuf_split_max(sb, delim, 0);
}
extern void strbuf_list_free(struct strbuf **);
/*----- add data in your buffer -----*/