Skip to content

Commit

Permalink
Merge branch 'jk/strbuf-tolower'
Browse files Browse the repository at this point in the history
* jk/strbuf-tolower:
  strbuf: add strbuf_tolower function
  • Loading branch information
Junio C Hamano committed Jun 16, 2014
2 parents b4516df + ffb20ce commit b4bba8d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Documentation/technical/api-strbuf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ Functions

Strip whitespace from the beginning of a string.

`strbuf_tolower`::

Lowercase each character in the buffer using `tolower`.

`strbuf_cmp`::

Compare two buffers. Returns an integer less than, equal to, or greater
Expand Down
8 changes: 1 addition & 7 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,6 @@ int git_config_include(const char *var, const char *value, void *data)
return ret;
}

static void lowercase(char *p)
{
for (; *p; p++)
*p = tolower(*p);
}

void git_config_push_parameter(const char *text)
{
struct strbuf env = STRBUF_INIT;
Expand Down Expand Up @@ -180,7 +174,7 @@ int git_config_parse_parameter(const char *text,
strbuf_list_free(pair);
return error("bogus config parameter: %s", text);
}
lowercase(pair[0]->buf);
strbuf_tolower(pair[0]);
if (fn(pair[0]->buf, pair[1] ? pair[1]->buf : NULL, data) < 0) {
strbuf_list_free(pair);
return -1;
Expand Down
7 changes: 7 additions & 0 deletions strbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}

void strbuf_tolower(struct strbuf *sb)
{
char *p = sb->buf, *end = sb->buf + sb->len;
for (; p < end; p++)
*p = tolower(*p);
}

struct strbuf **strbuf_split_buf(const char *str, size_t slen,
int terminator, int max)
{
Expand Down
1 change: 1 addition & 0 deletions strbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len)
extern void strbuf_trim(struct strbuf *);
extern void strbuf_rtrim(struct strbuf *);
extern void strbuf_ltrim(struct strbuf *);
extern void strbuf_tolower(struct strbuf *sb);
extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);

/*
Expand Down

0 comments on commit b4bba8d

Please sign in to comment.