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

Strbuf API extensions and fixes.

Browse Source 
* Add strbuf_rtrim to remove trailing spaces.
  * Add strbuf_insert to insert data at a given position.
  * Off-by one fix in strbuf_addf: strbuf_avail() does not counts the final
    \0 so the overflow test for snprintf is the strict comparison. This is
    not critical as the growth mechanism chosen will always allocate _more_
    memory than asked, so the second test will not fail. It's some kind of
    miracle though.
  * Add size extension hints for strbuf_init and strbuf_read. If 0, default
    applies, else:
      + initial buffer has the given size for strbuf_init.
      + first growth checks it has at least this size rather than the
        default 8192.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pierre Habouzit
2007-09-10 12:35:04 +02:00
committed by Junio C Hamano
parent ddb95de33e
commit f1696ee398
14 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-blame.c
View File

@ -2023,7 +2023,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
origin = make_origin(commit, path);
strbuf_init(&buf);
strbuf_init(&buf, 0);
if (!contents_from || strcmp("-", contents_from)) {
struct stat st;
const char *read_from;
@ -2046,7 +2046,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
fd = open(read_from, O_RDONLY);
if (fd < 0)
die("cannot open %s", read_from);
if (strbuf_read(&buf, fd) != xsize_t(st.st_size))
if (strbuf_read(&buf, fd, 0) != xsize_t(st.st_size))
die("cannot read %s", read_from);
break;
case S_IFLNK:
@ -2062,7 +2062,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
/* Reading from stdin */
contents_from = "standard input";
mode = 0;
if (strbuf_read(&buf, 0) < 0)
if (strbuf_read(&buf, 0, 0) < 0)
die("read error %s from stdin", strerror(errno));
}
origin->file.ptr = buf.buf;