diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-20 13:12:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-20 13:12:11 -0700 |
| commit | 9ba66403fd1307fac258167d28d5a16facbe2521 (patch) | |
| tree | a6a4016fd70ae387784d6ab13c868e225f4385b2 | |
| parent | 7a3b4e3bd20989858341e42850bbc122887bdd73 (diff) | |
| parent | 97ea0d1043715f8fa2ee4a833195519c0be4e046 (diff) | |
| download | git-9ba66403fd1307fac258167d28d5a16facbe2521.tar.gz | |
Merge branch 'jm/api-strbuf-doc'
* jm/api-strbuf-doc:
api-strbuf.txt minor typos
| -rw-r--r-- | Documentation/technical/api-strbuf.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt index 077a7096a4..f9c06a7573 100644 --- a/Documentation/technical/api-strbuf.txt +++ b/Documentation/technical/api-strbuf.txt @@ -7,10 +7,10 @@ use the mem* functions than a str* one (memchr vs. strchr e.g.). Though, one has to be careful about the fact that str* functions often stop on NULs and that strbufs may have embedded NULs. -An strbuf is NUL terminated for convenience, but no function in the +A strbuf is NUL terminated for convenience, but no function in the strbuf API actually relies on the string being free of NULs. -strbufs has some invariants that are very important to keep in mind: +strbufs have some invariants that are very important to keep in mind: . The `buf` member is never NULL, so it can be used in any usual C string operations safely. strbuf's _have_ to be initialized either by @@ -56,8 +56,8 @@ Data structures * `struct strbuf` This is the string buffer structure. The `len` member can be used to -determine the current length of the string, and `buf` member provides access to -the string itself. +determine the current length of the string, and `buf` member provides +access to the string itself. Functions --------- @@ -202,7 +202,7 @@ strbuf_addstr(sb, "immediate string"); `strbuf_addbuf`:: - Copy the contents of an other buffer at the end of the current one. + Copy the contents of another buffer at the end of the current one. `strbuf_adddup`:: |